From ba916da04dee551746ab9f3c815a8a812677625d Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Tue, 30 Jun 2020 00:43:14 +0000 Subject: [PATCH] Cleanup related to previous commit. --- .../network/serverpackets/CharInfo.java | 44 +++++------ .../network/serverpackets/UserInfo.java | 66 +++++++++-------- .../network/serverpackets/CharInfo.java | 52 ++++++------- .../network/serverpackets/UserInfo.java | 74 ++++++++++--------- 4 files changed, 120 insertions(+), 116 deletions(-) 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 fb22970bee..0980c99b32 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 @@ -30,7 +30,7 @@ public class CharInfo extends GameServerPacket private static final Logger LOGGER = Logger.getLogger(CharInfo.class.getName()); private final PlayerInstance _player; - private final Inventory _inv; + private final Inventory _inventory; private final int _x; private final int _y; private final int _z; @@ -47,15 +47,15 @@ public class CharInfo extends GameServerPacket public CharInfo(PlayerInstance player) { _player = player; - _inv = player.getInventory(); - _x = _player.getX(); - _y = _player.getY(); - _z = _player.getZ(); - _heading = _player.getHeading(); - _mAtkSpd = _player.getMAtkSpd(); - _pAtkSpd = _player.getPAtkSpd(); - _moveMultiplier = _player.getMovementSpeedMultiplier(); - _attackSpeedMultiplier = _player.getAttackSpeedMultiplier(); + _inventory = player.getInventory(); + _x = player.getX(); + _y = player.getY(); + _z = player.getZ(); + _heading = player.getHeading(); + _mAtkSpd = player.getMAtkSpd(); + _pAtkSpd = player.getPAtkSpd(); + _attackSpeedMultiplier = player.getAttackSpeedMultiplier(); + _moveMultiplier = player.getMovementSpeedMultiplier(); _runSpd = Math.round(player.getRunSpeed() / _moveMultiplier); _walkSpd = Math.round(player.getWalkSpeed() / _moveMultiplier); _flyRunSpd = player.isFlying() ? _runSpd : 0; @@ -106,9 +106,9 @@ public class CharInfo extends GameServerPacket writeF(_attackSpeedMultiplier); writeF(template.getCollisionRadius()); writeF(template.getCollisionHeight()); - writeD(_inv.getPaperdollItemId(Inventory.PAPERDOLL_RHAND)); // right hand weapon + writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_RHAND)); // right hand weapon writeD(0); - writeD(_inv.getPaperdollItemId(Inventory.PAPERDOLL_LHAND)); // left hand weapon + writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_LHAND)); // left hand weapon writeC(1); // name above char 1=true ... ?? writeC(_player.isRunning() ? 1 : 0); writeC(_player.isInCombat() ? 1 : 0); @@ -179,16 +179,16 @@ public class CharInfo extends GameServerPacket } writeD(0x00); - writeD(_inv.getPaperdollItemId(Inventory.PAPERDOLL_HEAD)); - writeD(_inv.getPaperdollItemId(Inventory.PAPERDOLL_RHAND)); - writeD(_inv.getPaperdollItemId(Inventory.PAPERDOLL_LHAND)); - writeD(_inv.getPaperdollItemId(Inventory.PAPERDOLL_GLOVES)); - writeD(_inv.getPaperdollItemId(Inventory.PAPERDOLL_CHEST)); - writeD(_inv.getPaperdollItemId(Inventory.PAPERDOLL_LEGS)); - writeD(_inv.getPaperdollItemId(Inventory.PAPERDOLL_FEET)); - writeD(_inv.getPaperdollItemId(Inventory.PAPERDOLL_BACK)); - writeD(_inv.getPaperdollItemId(Inventory.PAPERDOLL_LRHAND)); - writeD(_inv.getPaperdollItemId(Inventory.PAPERDOLL_HAIR)); + writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_HEAD)); + writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_RHAND)); + writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_LHAND)); + writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_GLOVES)); + writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_CHEST)); + writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_LEGS)); + writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_FEET)); + writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_BACK)); + writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_LRHAND)); + writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_HAIR)); writeD(_player.getPvpFlag()); writeD(_player.getKarma()); 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 9441587492..fd15870a6e 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 @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.itemcontainer.Inventory; public class UserInfo extends GameServerPacket { private final PlayerInstance _player; + private final Inventory _inventory; private final float _moveMultiplier; private final int _runSpd; private final int _walkSpd; @@ -37,6 +38,7 @@ public class UserInfo extends GameServerPacket public UserInfo(PlayerInstance player) { _player = player; + _inventory = player.getInventory(); _moveMultiplier = player.getMovementSpeedMultiplier(); _runSpd = Math.round(player.getRunSpeed() / _moveMultiplier); _walkSpd = Math.round(player.getWalkSpeed() / _moveMultiplier); @@ -95,39 +97,39 @@ public class UserInfo extends GameServerPacket writeD(_player.getActiveWeaponItem() != null ? 40 : 20); // 20 no weapon, 40 weapon equipped - writeD(_player.getInventory().getPaperdollObjectId(Inventory.PAPERDOLL_UNDER)); - writeD(_player.getInventory().getPaperdollObjectId(Inventory.PAPERDOLL_REAR)); - writeD(_player.getInventory().getPaperdollObjectId(Inventory.PAPERDOLL_LEAR)); - writeD(_player.getInventory().getPaperdollObjectId(Inventory.PAPERDOLL_NECK)); - writeD(_player.getInventory().getPaperdollObjectId(Inventory.PAPERDOLL_RFINGER)); - writeD(_player.getInventory().getPaperdollObjectId(Inventory.PAPERDOLL_LFINGER)); - writeD(_player.getInventory().getPaperdollObjectId(Inventory.PAPERDOLL_HEAD)); - writeD(_player.getInventory().getPaperdollObjectId(Inventory.PAPERDOLL_RHAND)); - writeD(_player.getInventory().getPaperdollObjectId(Inventory.PAPERDOLL_LHAND)); - writeD(_player.getInventory().getPaperdollObjectId(Inventory.PAPERDOLL_GLOVES)); - writeD(_player.getInventory().getPaperdollObjectId(Inventory.PAPERDOLL_CHEST)); - writeD(_player.getInventory().getPaperdollObjectId(Inventory.PAPERDOLL_LEGS)); - writeD(_player.getInventory().getPaperdollObjectId(Inventory.PAPERDOLL_FEET)); - writeD(_player.getInventory().getPaperdollObjectId(Inventory.PAPERDOLL_BACK)); - writeD(_player.getInventory().getPaperdollObjectId(Inventory.PAPERDOLL_LRHAND)); - writeD(_player.getInventory().getPaperdollObjectId(Inventory.PAPERDOLL_HAIR)); + writeD(_inventory.getPaperdollObjectId(Inventory.PAPERDOLL_UNDER)); + writeD(_inventory.getPaperdollObjectId(Inventory.PAPERDOLL_REAR)); + writeD(_inventory.getPaperdollObjectId(Inventory.PAPERDOLL_LEAR)); + writeD(_inventory.getPaperdollObjectId(Inventory.PAPERDOLL_NECK)); + writeD(_inventory.getPaperdollObjectId(Inventory.PAPERDOLL_RFINGER)); + writeD(_inventory.getPaperdollObjectId(Inventory.PAPERDOLL_LFINGER)); + writeD(_inventory.getPaperdollObjectId(Inventory.PAPERDOLL_HEAD)); + writeD(_inventory.getPaperdollObjectId(Inventory.PAPERDOLL_RHAND)); + writeD(_inventory.getPaperdollObjectId(Inventory.PAPERDOLL_LHAND)); + writeD(_inventory.getPaperdollObjectId(Inventory.PAPERDOLL_GLOVES)); + writeD(_inventory.getPaperdollObjectId(Inventory.PAPERDOLL_CHEST)); + writeD(_inventory.getPaperdollObjectId(Inventory.PAPERDOLL_LEGS)); + writeD(_inventory.getPaperdollObjectId(Inventory.PAPERDOLL_FEET)); + writeD(_inventory.getPaperdollObjectId(Inventory.PAPERDOLL_BACK)); + writeD(_inventory.getPaperdollObjectId(Inventory.PAPERDOLL_LRHAND)); + writeD(_inventory.getPaperdollObjectId(Inventory.PAPERDOLL_HAIR)); - writeD(_player.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_UNDER)); - writeD(_player.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_REAR)); - writeD(_player.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_LEAR)); - writeD(_player.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_NECK)); - writeD(_player.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_RFINGER)); - writeD(_player.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_LFINGER)); - writeD(_player.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_HEAD)); - writeD(_player.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_RHAND)); - writeD(_player.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_LHAND)); - writeD(_player.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_GLOVES)); - writeD(_player.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_CHEST)); - writeD(_player.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_LEGS)); - writeD(_player.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_FEET)); - writeD(_player.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_BACK)); - writeD(_player.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_LRHAND)); - writeD(_player.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_HAIR)); + writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_UNDER)); + writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_REAR)); + writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_LEAR)); + writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_NECK)); + writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_RFINGER)); + writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_LFINGER)); + writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_HEAD)); + writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_RHAND)); + writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_LHAND)); + writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_GLOVES)); + writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_CHEST)); + writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_LEGS)); + writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_FEET)); + writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_BACK)); + writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_LRHAND)); + writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_HAIR)); writeD(_player.getPAtk(null)); writeD(_player.getPAtkSpd()); 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 35fb9b9978..a4d9ecad48 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 @@ -31,7 +31,7 @@ public class CharInfo extends GameServerPacket private static final Logger LOGGER = Logger.getLogger(CharInfo.class.getName()); private final PlayerInstance _player; - private final Inventory _inv; + private final Inventory _inventory; private final int _x; private final int _y; private final int _z; @@ -48,15 +48,15 @@ public class CharInfo extends GameServerPacket public CharInfo(PlayerInstance player) { _player = player; - _inv = player.getInventory(); - _x = _player.getX(); - _y = _player.getY(); - _z = _player.getZ(); - _heading = _player.getHeading(); - _mAtkSpd = _player.getMAtkSpd(); - _pAtkSpd = _player.getPAtkSpd(); - _moveMultiplier = _player.getMovementSpeedMultiplier(); - _attackSpeedMultiplier = _player.getAttackSpeedMultiplier(); + _inventory = player.getInventory(); + _x = player.getX(); + _y = player.getY(); + _z = player.getZ(); + _heading = player.getHeading(); + _mAtkSpd = player.getMAtkSpd(); + _pAtkSpd = player.getPAtkSpd(); + _attackSpeedMultiplier = player.getAttackSpeedMultiplier(); + _moveMultiplier = player.getMovementSpeedMultiplier(); _runSpd = Math.round(player.getRunSpeed() / _moveMultiplier); _walkSpd = Math.round(player.getWalkSpeed() / _moveMultiplier); _flyRunSpd = player.isFlying() ? _runSpd : 0; @@ -107,9 +107,9 @@ public class CharInfo extends GameServerPacket writeF(_attackSpeedMultiplier); writeF(template.getCollisionRadius()); writeF(template.getCollisionHeight()); - writeD(_inv.getPaperdollItemId(Inventory.PAPERDOLL_RHAND)); // right hand weapon + writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_RHAND)); // right hand weapon writeD(0); - writeD(_inv.getPaperdollItemId(Inventory.PAPERDOLL_LHAND)); // left hand weapon + writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_LHAND)); // left hand weapon writeC(1); // name above char 1=true ... ?? writeC(_player.isRunning() ? 1 : 0); writeC(_player.isInCombat() ? 1 : 0); @@ -179,25 +179,25 @@ public class CharInfo extends GameServerPacket writeD(_player.getBaseClass()); } - writeD(_inv.getPaperdollItemId(Inventory.PAPERDOLL_DHAIR)); - writeD(_inv.getPaperdollItemId(Inventory.PAPERDOLL_HEAD)); - writeD(_inv.getPaperdollItemId(Inventory.PAPERDOLL_RHAND)); - writeD(_inv.getPaperdollItemId(Inventory.PAPERDOLL_LHAND)); - writeD(_inv.getPaperdollItemId(Inventory.PAPERDOLL_GLOVES)); - writeD(_inv.getPaperdollItemId(Inventory.PAPERDOLL_CHEST)); - writeD(_inv.getPaperdollItemId(Inventory.PAPERDOLL_LEGS)); - writeD(_inv.getPaperdollItemId(Inventory.PAPERDOLL_FEET)); - writeD(_inv.getPaperdollItemId(Inventory.PAPERDOLL_BACK)); - writeD(_inv.getPaperdollItemId(Inventory.PAPERDOLL_LRHAND)); - writeD(_inv.getPaperdollItemId(Inventory.PAPERDOLL_HAIR)); - writeD(_inv.getPaperdollItemId(Inventory.PAPERDOLL_FACE)); + writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_DHAIR)); + writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_HEAD)); + writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_RHAND)); + writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_LHAND)); + writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_GLOVES)); + writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_CHEST)); + writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_LEGS)); + writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_FEET)); + writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_BACK)); + writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_LRHAND)); + writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_HAIR)); + writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_FACE)); // c6 new h's writeH(0x00); writeH(0x00); writeH(0x00); writeH(0x00); - writeD(_inv.getPaperdollAugmentationId(Inventory.PAPERDOLL_RHAND)); + writeD(_inventory.getPaperdollAugmentationId(Inventory.PAPERDOLL_RHAND)); writeH(0x00); writeH(0x00); writeH(0x00); @@ -210,7 +210,7 @@ public class CharInfo extends GameServerPacket writeH(0x00); writeH(0x00); writeH(0x00); - writeD(_inv.getPaperdollAugmentationId(Inventory.PAPERDOLL_LRHAND)); + writeD(_inventory.getPaperdollAugmentationId(Inventory.PAPERDOLL_LRHAND)); writeH(0x00); writeH(0x00); writeH(0x00); 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 cfb2740631..c1bd0eba8d 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 @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.itemcontainer.Inventory; public class UserInfo extends GameServerPacket { private final PlayerInstance _player; + private final Inventory _inventory; private final float _moveMultiplier; private final int _runSpd; private final int _walkSpd; @@ -38,6 +39,7 @@ public class UserInfo extends GameServerPacket public UserInfo(PlayerInstance player) { _player = player; + _inventory = player.getInventory(); _moveMultiplier = player.getMovementSpeedMultiplier(); _runSpd = Math.round(player.getRunSpeed() / _moveMultiplier); _walkSpd = Math.round(player.getWalkSpeed() / _moveMultiplier); @@ -96,41 +98,41 @@ public class UserInfo extends GameServerPacket writeD(_player.getActiveWeaponItem() != null ? 40 : 20); // 20 no weapon, 40 weapon equipped - writeD(_player.getInventory().getPaperdollObjectId(Inventory.PAPERDOLL_DHAIR)); - writeD(_player.getInventory().getPaperdollObjectId(Inventory.PAPERDOLL_REAR)); - writeD(_player.getInventory().getPaperdollObjectId(Inventory.PAPERDOLL_LEAR)); - writeD(_player.getInventory().getPaperdollObjectId(Inventory.PAPERDOLL_NECK)); - writeD(_player.getInventory().getPaperdollObjectId(Inventory.PAPERDOLL_RFINGER)); - writeD(_player.getInventory().getPaperdollObjectId(Inventory.PAPERDOLL_LFINGER)); - writeD(_player.getInventory().getPaperdollObjectId(Inventory.PAPERDOLL_HEAD)); - writeD(_player.getInventory().getPaperdollObjectId(Inventory.PAPERDOLL_RHAND)); - writeD(_player.getInventory().getPaperdollObjectId(Inventory.PAPERDOLL_LHAND)); - writeD(_player.getInventory().getPaperdollObjectId(Inventory.PAPERDOLL_GLOVES)); - writeD(_player.getInventory().getPaperdollObjectId(Inventory.PAPERDOLL_CHEST)); - writeD(_player.getInventory().getPaperdollObjectId(Inventory.PAPERDOLL_LEGS)); - writeD(_player.getInventory().getPaperdollObjectId(Inventory.PAPERDOLL_FEET)); - writeD(_player.getInventory().getPaperdollObjectId(Inventory.PAPERDOLL_BACK)); - writeD(_player.getInventory().getPaperdollObjectId(Inventory.PAPERDOLL_LRHAND)); - writeD(_player.getInventory().getPaperdollObjectId(Inventory.PAPERDOLL_HAIR)); - writeD(_player.getInventory().getPaperdollObjectId(Inventory.PAPERDOLL_FACE)); + writeD(_inventory.getPaperdollObjectId(Inventory.PAPERDOLL_DHAIR)); + writeD(_inventory.getPaperdollObjectId(Inventory.PAPERDOLL_REAR)); + writeD(_inventory.getPaperdollObjectId(Inventory.PAPERDOLL_LEAR)); + writeD(_inventory.getPaperdollObjectId(Inventory.PAPERDOLL_NECK)); + writeD(_inventory.getPaperdollObjectId(Inventory.PAPERDOLL_RFINGER)); + writeD(_inventory.getPaperdollObjectId(Inventory.PAPERDOLL_LFINGER)); + writeD(_inventory.getPaperdollObjectId(Inventory.PAPERDOLL_HEAD)); + writeD(_inventory.getPaperdollObjectId(Inventory.PAPERDOLL_RHAND)); + writeD(_inventory.getPaperdollObjectId(Inventory.PAPERDOLL_LHAND)); + writeD(_inventory.getPaperdollObjectId(Inventory.PAPERDOLL_GLOVES)); + writeD(_inventory.getPaperdollObjectId(Inventory.PAPERDOLL_CHEST)); + writeD(_inventory.getPaperdollObjectId(Inventory.PAPERDOLL_LEGS)); + writeD(_inventory.getPaperdollObjectId(Inventory.PAPERDOLL_FEET)); + writeD(_inventory.getPaperdollObjectId(Inventory.PAPERDOLL_BACK)); + writeD(_inventory.getPaperdollObjectId(Inventory.PAPERDOLL_LRHAND)); + writeD(_inventory.getPaperdollObjectId(Inventory.PAPERDOLL_HAIR)); + writeD(_inventory.getPaperdollObjectId(Inventory.PAPERDOLL_FACE)); - writeD(_player.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_DHAIR)); - writeD(_player.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_REAR)); - writeD(_player.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_LEAR)); - writeD(_player.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_NECK)); - writeD(_player.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_RFINGER)); - writeD(_player.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_LFINGER)); - writeD(_player.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_HEAD)); - writeD(_player.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_RHAND)); - writeD(_player.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_LHAND)); - writeD(_player.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_GLOVES)); - writeD(_player.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_CHEST)); - writeD(_player.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_LEGS)); - writeD(_player.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_FEET)); - writeD(_player.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_BACK)); - writeD(_player.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_LRHAND)); - writeD(_player.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_HAIR)); - writeD(_player.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_FACE)); + writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_DHAIR)); + writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_REAR)); + writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_LEAR)); + writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_NECK)); + writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_RFINGER)); + writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_LFINGER)); + writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_HEAD)); + writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_RHAND)); + writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_LHAND)); + writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_GLOVES)); + writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_CHEST)); + writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_LEGS)); + writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_FEET)); + writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_BACK)); + writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_LRHAND)); + writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_HAIR)); + writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_FACE)); // c6 new h's writeH(0x00); @@ -147,7 +149,7 @@ public class UserInfo extends GameServerPacket writeH(0x00); writeH(0x00); writeH(0x00); - writeD(_player.getInventory().getPaperdollAugmentationId(Inventory.PAPERDOLL_RHAND)); + writeD(_inventory.getPaperdollAugmentationId(Inventory.PAPERDOLL_RHAND)); writeH(0x00); writeH(0x00); writeH(0x00); @@ -160,7 +162,7 @@ public class UserInfo extends GameServerPacket writeH(0x00); writeH(0x00); writeH(0x00); - writeD(_player.getInventory().getPaperdollAugmentationId(Inventory.PAPERDOLL_LRHAND)); + writeD(_inventory.getPaperdollAugmentationId(Inventory.PAPERDOLL_LRHAND)); writeH(0x00); writeH(0x00); writeH(0x00);