Replaced unnecessary hexadecimal values with decimals and cleanup.

This commit is contained in:
MobiusDevelopment
2021-12-20 07:28:35 +00:00
parent ec58360479
commit 6959aa53a8
10366 changed files with 15725 additions and 36368 deletions

View File

@@ -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)

View File

@@ -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);
}
}

View File

@@ -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
{

View File

@@ -39,7 +39,6 @@ public class AllyInfo implements IClientOutgoingPacket
_player.sendPacket(SystemMessageId.YOU_ARE_NOT_CURRENTLY_ALLIED_WITH_ANY_CLANS);
return false;
}
// ======<AllyInfo>======
SystemMessage sm = new SystemMessage(SystemMessageId.ALLIANCE_INFORMATION);
_player.sendPacket(sm);

View File

@@ -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);

View File

@@ -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)));

View File

@@ -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;

View File

@@ -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();

View File

@@ -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;

View File

@@ -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;
}
}

View File

@@ -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;

View File

@@ -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;
}

View File

@@ -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<CharSelectInfoPackage> 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;
}
}

View File

@@ -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;
}
}

View File

@@ -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());

View File

@@ -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))

View File

@@ -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<Integer> _types = new ArrayList<>();
private final List<Object> _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;
}

View File

@@ -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;
}
}

View File

@@ -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;
}
}

View File

@@ -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;
}
}

View File

@@ -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;
}

View File

@@ -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;
}
}

View File

@@ -122,7 +122,6 @@ public class EquipUpdate implements IClientOutgoingPacket
break;
}
}
packet.writeD(bodypart);
return true;
}

View File

@@ -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..)

View File

@@ -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;
}
}

View File

@@ -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)
{

View File

@@ -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

View File

@@ -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;

View File

@@ -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;
}

View File

@@ -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;
}

View File

@@ -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;
}

View File

@@ -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);

View File

@@ -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)
{

View File

@@ -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);

View File

@@ -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;
}
}

View File

@@ -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);

View File

@@ -30,10 +30,8 @@ public class ExGetBossRecord implements IClientOutgoingPacket
{
/** The _boss record info. */
private final Map<Integer, Integer> _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;

View File

@@ -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));

View File

@@ -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);

View File

@@ -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())
{

View File

@@ -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

View File

@@ -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())
{

View File

@@ -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;

View File

@@ -58,7 +58,6 @@ public class ExPCCafePointInfo implements IClientOutgoingPacket
_periodType = 2;
_pointType = 2;
}
_remainTime = hour;
}

View File

@@ -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)
{

View File

@@ -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

View File

@@ -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;

View File

@@ -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<CropProcure> _crops;

View File

@@ -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

View File

@@ -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<Integer, CropProcure> entry : _castleCrops.entrySet())
{
final CropProcure crop = entry.getValue();

View File

@@ -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

View File

@@ -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<Integer> 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());

View File

@@ -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);

View File

@@ -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);

View File

@@ -26,7 +26,6 @@ public class ExVariationCancelResult implements IClientOutgoingPacket
{
/** The _close window. */
private final int _closeWindow;
/** The _unk1. */
private final int _unk1;

View File

@@ -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;

View File

@@ -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;
}
}

View File

@@ -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;
}

View File

@@ -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;

View File

@@ -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++)
{

View File

@@ -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
}

View File

@@ -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<ClanMember> members = _clan.getMembers();
packet.writeD(members.size());
for (ClanMember member : members)

View File

@@ -42,7 +42,6 @@ public class GMViewQuestList implements IClientOutgoingPacket
{
OutgoingPackets.GM_VIEW_QUEST_LIST.writeId(packet);
packet.writeS(_player.getName());
final List<Quest> 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;

View File

@@ -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;
}

View File

@@ -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:

View File

@@ -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());

View File

@@ -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.

View File

@@ -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++)
{

View File

@@ -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

View File

@@ -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

View File

@@ -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;

View File

@@ -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

View File

@@ -45,7 +45,6 @@ public class JoinParty implements IClientOutgoingPacket
public boolean write(PacketWriter packet)
{
OutgoingPackets.JOIN_PARTY.writeId(packet);
packet.writeD(_response);
return true;
}

View File

@@ -35,7 +35,6 @@ public class JoinPledge implements IClientOutgoingPacket
public boolean write(PacketWriter packet)
{
OutgoingPackets.JOIN_PLEDGE.writeId(packet);
packet.writeD(_pledgeId);
return true;
}

View File

@@ -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;
}
}

View File

@@ -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;
}
}

View File

@@ -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;
}

View File

@@ -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);

View File

@@ -45,7 +45,6 @@ public class ManagePledgePower implements IClientOutgoingPacket
{
return true;
}
OutgoingPackets.MANAGE_PLEDGE_POWER.writeId(packet);
packet.writeD(0);
packet.writeD(0);

View File

@@ -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;
}
}

View File

@@ -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);

View File

@@ -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;

View File

@@ -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);

View File

@@ -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
}
}
}

View File

@@ -47,7 +47,6 @@ public class MyTargetSelected implements IClientOutgoingPacket
{
/** The _object id. */
private final int _objectId;
/** The _color. */
private final int _color;

View File

@@ -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 = "<html><body></body></html>";
return;
}
if (text.length() > 8192)
{
PacketLogger.warning("Html is too long! This will crash the client!");
_html = "<html><body>Html was too long,<br>Try to use DB for this action</body></html>";
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;
}

View File

@@ -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;
}
}

View File

@@ -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;
}
}

View File

@@ -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;

View File

@@ -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)
{

View File

@@ -56,7 +56,6 @@ public class PartyMemberPosition implements IClientOutgoingPacket
{
OutgoingPackets.PARTY_MEMBER_POSITION.writeId(packet);
packet.writeD(_locations.size());
for (Entry<Integer, Location> entry : _locations.entrySet())
{
final Location loc = entry.getValue();

View File

@@ -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;
}

View File

@@ -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());
}
}

View File

@@ -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());

View File

@@ -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());

View File

@@ -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)

View File

@@ -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;
}

View File

@@ -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;
}

View File

@@ -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;
}

View File

@@ -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

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