lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed boolean parameter from L2PcInstance sendItemList method.

Browse Source 
Contributed by SkOdD.
This commit is contained in:
MobiusDev 2018-08-07 14:28:45 +00:00
parent 37889d0f41
commit 40ce6af70d
22 changed files with 46 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/Observation.java vendored
View File

@ -160,7 +160,7 @@ public class Observation implements IBypassHandler
{
// enter mode
player.enterObserverMode(pos);
player.sendItemList(false);
player.sendItemList();
}
player.sendPacket(ActionFailed.STATIC_PACKET);
}

2
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/RecipeController.java
View File

@ -439,7 +439,7 @@ public class RecipeController
updateCurMp();
_activeMakers.remove(_player.getObjectId());
_player.setIsCrafting(false);
_target.sendItemList(false);
_target.sendItemList();
}
private void updateMakeInfo(boolean success)

2
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/CombatFlag.java
View File

@ -92,7 +92,7 @@ public class CombatFlag
}
else
{
_player.sendItemList(false);
_player.sendItemList();
}
// Refresh player stats
_player.broadcastUserInfo();

6
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/CursedWeapon.java
View File

@ -126,7 +126,7 @@ public class CursedWeapon implements INamable
}
else
{
_player.sendItemList(false);
_player.sendItemList();
}
_player.broadcastUserInfo();
@ -187,7 +187,7 @@ public class CursedWeapon implements INamable
}
else
{
_player.sendItemList(false);
_player.sendItemList();
}
_player.broadcastUserInfo();
@ -453,7 +453,7 @@ public class CursedWeapon implements INamable
}
else
{
_player.sendItemList(false);
_player.sendItemList();
}
// Refresh player stats

2
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2Clan.java
View File

@ -2609,7 +2609,7 @@ public class L2Clan implements IIdentifiable, INamable
ui.addComponentType(UserInfoType.CURRENT_HPMPCP_EXP_SP);
player.sendPacket(ui);
player.sendItemList(false);
player.sendItemList();
changeLevel(_level + 1);

4
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/TradeList.java
View File

@ -616,7 +616,7 @@ public class TradeList
}
else
{
_owner.sendItemList(false);
_owner.sendItemList();
}
if (partnerIU != null)
@ -625,7 +625,7 @@ public class TradeList
}
else
{
_partner.sendItemList(false);
_partner.sendItemList();
}
success = true;
}

33
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
View File

@ -2949,7 +2949,7 @@ public final class L2PcInstance extends L2Playable
}
else
{
sendItemList(false);
sendItemList();
}
}
}
@ -2990,7 +2990,7 @@ public final class L2PcInstance extends L2Playable
}
else
{
sendItemList(false);
sendItemList();
}
if (sendMessage)
@ -3040,7 +3040,7 @@ public final class L2PcInstance extends L2Playable
}
else
{
sendItemList(false);
sendItemList();
}
if (sendMessage)
@ -3093,7 +3093,7 @@ public final class L2PcInstance extends L2Playable
}
else
{
sendItemList(false);
sendItemList();
}
}
}
@ -3134,7 +3134,7 @@ public final class L2PcInstance extends L2Playable
}
else
{
sendItemList(false);
sendItemList();
}
if (sendMessage)
@ -3360,7 +3360,7 @@ public final class L2PcInstance extends L2Playable
}
else
{
sendItemList(false);
sendItemList();
}
// Sends message to client if requested
@ -3474,7 +3474,7 @@ public final class L2PcInstance extends L2Playable
}
else
{
sendItemList(false);
sendItemList();
}
// Sends message to client if requested
@ -3538,7 +3538,7 @@ public final class L2PcInstance extends L2Playable
}
else
{
sendItemList(false);
sendItemList();
}
// Send target update packet
@ -3563,7 +3563,7 @@ public final class L2PcInstance extends L2Playable
}
else
{
targetPlayer.sendItemList(false);
targetPlayer.sendItemList();
}
}
else if (target instanceof PetInventory)
@ -3690,7 +3690,7 @@ public final class L2PcInstance extends L2Playable
}
else
{
sendItemList(false);
sendItemList();
}
// Sends message to client if requested
@ -3777,7 +3777,7 @@ public final class L2PcInstance extends L2Playable
}
else
{
sendItemList(false);
sendItemList();
}
// Sends message to client if requested
@ -5861,7 +5861,7 @@ public final class L2PcInstance extends L2Playable
{
// Equip arrows needed in left hand
_inventory.setPaperdollItem(Inventory.PAPERDOLL_LHAND, arrows);
sendItemList(false);
sendItemList();
return true;
}
}
@ -13735,13 +13735,10 @@ public final class L2PcInstance extends L2Playable
sendPacket(new ExUserInfoInvenWeight(this));
}
/**
* @param open
*/
public void sendItemList(boolean open)
public void sendItemList()
{
sendPacket(new ItemList(1, this, open));
sendPacket(new ItemList(2, this, open));
sendPacket(new ItemList(1, this));
sendPacket(new ItemList(2, this));
sendPacket(new ExQuestItemList(1, this));
sendPacket(new ExQuestItemList(2, this));
sendPacket(new ExAdenaInvenCount(this));

12
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java
View File

@ -413,7 +413,7 @@ public class PcInventory extends Inventory
}
else
{
actor.sendItemList(false);
actor.sendItemList();
}
// Notify to scripts
@ -481,7 +481,7 @@ public class PcInventory extends Inventory
}
else
{
actor.sendItemList(false);
actor.sendItemList();
}
}
@ -528,7 +528,7 @@ public class PcInventory extends Inventory
if ((item != null) && (actor != null))
{
actor.sendItemList(false);
actor.sendItemList();
}
return item;
}
@ -865,7 +865,7 @@ public class PcInventory extends Inventory
_blockMode = mode;
_blockItems = items;
_owner.sendItemList(false);
_owner.sendItemList();
}
/**
@ -876,7 +876,7 @@ public class PcInventory extends Inventory
_blockMode = InventoryBlockType.NONE;
_blockItems = null;
_owner.sendItemList(false);
_owner.sendItemList();
}
/**
@ -1048,7 +1048,7 @@ public class PcInventory extends Inventory
{
if (Config.FORCE_INVENTORY_UPDATE)
{
_owner.sendItemList(false);
_owner.sendItemList();
}
else
{

4
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
View File

@ -325,8 +325,8 @@ public class EnterWorld implements IClientIncomingPacket
client.sendPacket(new ExGetBookMarkInfoPacket(activeChar));
// Send Item List
client.sendPacket(new ItemList(1, activeChar, false));
client.sendPacket(new ItemList(2, activeChar, false));
client.sendPacket(new ItemList(1, activeChar));
client.sendPacket(new ItemList(2, activeChar));
// Send Quest Item List
client.sendPacket(new ExQuestItemList(1, activeChar));

2
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
View File

@ -706,7 +706,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket
player.addSkill(skill, store);
player.sendItemList(false);
player.sendItemList();
player.sendPacket(new ShortCutInit(player));
player.sendPacket(new ExBasicActionList(ExBasicActionList.DEFAULT_ACTION_LIST));
player.sendSkillList(skill.getId());

2
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestBuySellUIClose.java
View File

@ -37,6 +37,6 @@ public class RequestBuySellUIClose implements IClientIncomingPacket
return;
}
activeChar.sendItemList(true);
activeChar.sendItemList();
}
}

2
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java
View File

@ -203,7 +203,7 @@ public final class RequestCancelPostAttachment implements IClientIncomingPacket
}
else
{
activeChar.sendItemList(false);
activeChar.sendItemList();
}
final L2PcInstance receiver = L2World.getInstance().getPlayer(msg.getReceiverId());

2
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
View File

@ -228,7 +228,7 @@ public final class RequestDestroyItem implements IClientIncomingPacket
}
else
{
activeChar.sendItemList(true);
activeChar.sendItemList();
}
}
}

2
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java
View File

@ -169,7 +169,7 @@ public final class RequestDropItem implements IClientIncomingPacket
{
activeChar.getInventory().unEquipItemInSlot(item.getLocationSlot());
activeChar.broadcastUserInfo();
activeChar.sendItemList(true);
activeChar.sendItemList();
}
final L2ItemInstance dropedItem = activeChar.dropItem("Drop", _objectId, _count, _x, _y, _z, null, false, false);

2
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
View File

@ -490,7 +490,7 @@ public final class RequestEnchantItem implements IClientIncomingPacket
}
else
{
activeChar.sendItemList(true);
activeChar.sendItemList();
}
request.setProcessing(false);

2
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
View File

@ -36,7 +36,7 @@ public final class RequestItemList implements IClientIncomingPacket
{
if ((client != null) && (client.getActiveChar() != null) && !client.getActiveChar().isInventoryDisabled())
{
client.getActiveChar().sendItemList(true);
client.getActiveChar().sendItemList();
}
}
}

2
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java
View File

@ -202,7 +202,7 @@ public class RequestPackageSend implements IClientIncomingPacket
}
else
{
player.sendItemList(false);
player.sendItemList();
}
}

2
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
View File

@ -230,7 +230,7 @@ public final class RequestPostAttachment implements IClientIncomingPacket
}
else
{
activeChar.sendItemList(false);
activeChar.sendItemList();
}
msg.removeAttachments();

2
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java
View File

@ -355,7 +355,7 @@ public final class RequestSendPost implements IClientIncomingPacket
}
else
{
player.sendItemList(false);
player.sendItemList();
}
return true;

2
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
View File

@ -211,7 +211,7 @@ public final class SendWareHouseDepositList implements IClientIncomingPacket
}
else
{
player.sendItemList(false);
player.sendItemList();
}
}
}

2
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java
View File

@ -197,7 +197,7 @@ public final class SendWareHouseWithDrawList implements IClientIncomingPacket
}
else
{
player.sendItemList(false);
player.sendItemList();
}
}
}

6
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/ItemList.java
View File

@ -29,13 +29,11 @@ public final class ItemList extends AbstractItemPacket
private final int _sendType;
private final L2PcInstance _activeChar;
private final List<L2ItemInstance> _items;
private final boolean _showWindow;
public ItemList(int sendType, L2PcInstance activeChar, boolean showWindow)
public ItemList(int sendType, L2PcInstance activeChar)
{
_sendType = sendType;
_activeChar = activeChar;
_showWindow = showWindow;
_items = activeChar.getInventory().getItems(item -> !item.isQuestItem()).stream().collect(Collectors.toList());
}
@ -55,7 +53,7 @@ public final class ItemList extends AbstractItemPacket
}
else
{
packet.writeC(_showWindow ? 0x01 : 0x00);
packet.writeC(0x01); // _showWindow ? 0x01 : 0x00
packet.writeD(0x00);
packet.writeD(_items.size());
}