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

Fix for warehouse deposit bug.

Browse Source
This commit is contained in:
MobiusDev
2015-12-10 12:31:50 +00:00
parent 84bd14b980
commit 8addd37c88
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
trunk/java/com/l2jserver/gameserver/network/serverpackets/WareHouseDepositList.java
View File

@@ -21,6 +21,7 @@ package com.l2jserver.gameserver.network.serverpackets;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import com.l2jserver.gameserver.enums.ItemLocation;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
@@ -31,7 +32,7 @@ public final class WareHouseDepositList extends AbstractItemPacket
public static final int CASTLE = 3; public static final int CASTLE = 3;
public static final int FREIGHT = 1; public static final int FREIGHT = 1;
private final long _playerAdena; private final long _playerAdena;
private final int _invSize; private int _itemsInWarehouse;
private final List<L2ItemInstance> _items = new ArrayList<>(); private final List<L2ItemInstance> _items = new ArrayList<>();
private final List<Integer> _itemsStackable = new ArrayList<>(); private final List<Integer> _itemsStackable = new ArrayList<>();
/** /**
@@ -48,19 +49,27 @@ public final class WareHouseDepositList extends AbstractItemPacket
{ {
_whType = type; _whType = type;
_playerAdena = player.getAdena(); _playerAdena = player.getAdena();
_invSize = player.getInventory().getSize(); _itemsInWarehouse = 0;
final boolean isPrivate = _whType == PRIVATE; final boolean isPrivate = _whType == PRIVATE;
for (L2ItemInstance temp : player.getInventory().getAvailableItems(true, isPrivate, false)) for (L2ItemInstance temp : player.getInventory().getAvailableItems(true, isPrivate, false))
{ {
if ((temp != null) && temp.isDepositable(isPrivate)) if (temp == null)
{
continue;
}
if (temp.isDepositable(isPrivate))
{ {
_items.add(temp); _items.add(temp);
} }
if ((temp != null) && temp.isDepositable(isPrivate) && temp.isStackable()) if (temp.isDepositable(isPrivate) && temp.isStackable())
{ {
_itemsStackable.add(temp.getDisplayId()); _itemsStackable.add(temp.getDisplayId());
} }
if (temp.getItemLocation() == (isPrivate ? ItemLocation.WAREHOUSE : ItemLocation.CLANWH))
{
_itemsInWarehouse++;
}
} }
} }
@@ -70,7 +79,7 @@ public final class WareHouseDepositList extends AbstractItemPacket
writeC(0x41); writeC(0x41);
writeH(_whType); writeH(_whType);
writeQ(_playerAdena); writeQ(_playerAdena);
writeD(_invSize); writeD(_itemsInWarehouse);
writeH(_itemsStackable.size()); writeH(_itemsStackable.size());
for (int itemId : _itemsStackable) for (int itemId : _itemsStackable)