Fixed warehouse withdraw duplicate visual bug.
This commit is contained in:
@ -28,7 +28,6 @@ import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse;
|
|||||||
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
|
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
|
||||||
import org.l2jmobius.gameserver.network.GameClient;
|
import org.l2jmobius.gameserver.network.GameClient;
|
||||||
import org.l2jmobius.gameserver.network.SystemMessageId;
|
import org.l2jmobius.gameserver.network.SystemMessageId;
|
||||||
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
|
|
||||||
import org.l2jmobius.gameserver.util.Util;
|
import org.l2jmobius.gameserver.util.Util;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -159,7 +158,6 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Proceed to the transfer
|
// Proceed to the transfer
|
||||||
final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate();
|
|
||||||
for (ItemHolder i : _items)
|
for (ItemHolder i : _items)
|
||||||
{
|
{
|
||||||
final ItemInstance oldItem = warehouse.getItemByObjectId(i.getId());
|
final ItemInstance oldItem = warehouse.getItemByObjectId(i.getId());
|
||||||
@ -174,28 +172,9 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket
|
|||||||
LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)");
|
LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (playerIU != null)
|
|
||||||
{
|
|
||||||
if (newItem.getCount() > i.getCount())
|
|
||||||
{
|
|
||||||
playerIU.addModifiedItem(newItem);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
playerIU.addNewItem(newItem);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Send updated item list to the player
|
// Send updated item list to the player
|
||||||
if (playerIU != null)
|
player.sendItemList(false);
|
||||||
{
|
|
||||||
player.sendInventoryUpdate(playerIU);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
player.sendItemList(false);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -28,7 +28,6 @@ import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse;
|
|||||||
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
|
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
|
||||||
import org.l2jmobius.gameserver.network.GameClient;
|
import org.l2jmobius.gameserver.network.GameClient;
|
||||||
import org.l2jmobius.gameserver.network.SystemMessageId;
|
import org.l2jmobius.gameserver.network.SystemMessageId;
|
||||||
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
|
|
||||||
import org.l2jmobius.gameserver.util.Util;
|
import org.l2jmobius.gameserver.util.Util;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -159,7 +158,6 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Proceed to the transfer
|
// Proceed to the transfer
|
||||||
final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate();
|
|
||||||
for (ItemHolder i : _items)
|
for (ItemHolder i : _items)
|
||||||
{
|
{
|
||||||
final ItemInstance oldItem = warehouse.getItemByObjectId(i.getId());
|
final ItemInstance oldItem = warehouse.getItemByObjectId(i.getId());
|
||||||
@ -174,28 +172,9 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket
|
|||||||
LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)");
|
LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (playerIU != null)
|
|
||||||
{
|
|
||||||
if (newItem.getCount() > i.getCount())
|
|
||||||
{
|
|
||||||
playerIU.addModifiedItem(newItem);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
playerIU.addNewItem(newItem);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Send updated item list to the player
|
// Send updated item list to the player
|
||||||
if (playerIU != null)
|
player.sendItemList(false);
|
||||||
{
|
|
||||||
player.sendInventoryUpdate(playerIU);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
player.sendItemList(false);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -28,7 +28,6 @@ import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse;
|
|||||||
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
|
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
|
||||||
import org.l2jmobius.gameserver.network.GameClient;
|
import org.l2jmobius.gameserver.network.GameClient;
|
||||||
import org.l2jmobius.gameserver.network.SystemMessageId;
|
import org.l2jmobius.gameserver.network.SystemMessageId;
|
||||||
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
|
|
||||||
import org.l2jmobius.gameserver.util.Util;
|
import org.l2jmobius.gameserver.util.Util;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -159,7 +158,6 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Proceed to the transfer
|
// Proceed to the transfer
|
||||||
final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate();
|
|
||||||
for (ItemHolder i : _items)
|
for (ItemHolder i : _items)
|
||||||
{
|
{
|
||||||
final ItemInstance oldItem = warehouse.getItemByObjectId(i.getId());
|
final ItemInstance oldItem = warehouse.getItemByObjectId(i.getId());
|
||||||
@ -174,28 +172,9 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket
|
|||||||
LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)");
|
LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (playerIU != null)
|
|
||||||
{
|
|
||||||
if (newItem.getCount() > i.getCount())
|
|
||||||
{
|
|
||||||
playerIU.addModifiedItem(newItem);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
playerIU.addNewItem(newItem);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Send updated item list to the player
|
// Send updated item list to the player
|
||||||
if (playerIU != null)
|
player.sendItemList(false);
|
||||||
{
|
|
||||||
player.sendInventoryUpdate(playerIU);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
player.sendItemList(false);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -28,7 +28,6 @@ import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse;
|
|||||||
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
|
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
|
||||||
import org.l2jmobius.gameserver.network.GameClient;
|
import org.l2jmobius.gameserver.network.GameClient;
|
||||||
import org.l2jmobius.gameserver.network.SystemMessageId;
|
import org.l2jmobius.gameserver.network.SystemMessageId;
|
||||||
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
|
|
||||||
import org.l2jmobius.gameserver.util.Util;
|
import org.l2jmobius.gameserver.util.Util;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -159,7 +158,6 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Proceed to the transfer
|
// Proceed to the transfer
|
||||||
final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate();
|
|
||||||
for (ItemHolder i : _items)
|
for (ItemHolder i : _items)
|
||||||
{
|
{
|
||||||
final ItemInstance oldItem = warehouse.getItemByObjectId(i.getId());
|
final ItemInstance oldItem = warehouse.getItemByObjectId(i.getId());
|
||||||
@ -174,28 +172,9 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket
|
|||||||
LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)");
|
LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (playerIU != null)
|
|
||||||
{
|
|
||||||
if (newItem.getCount() > i.getCount())
|
|
||||||
{
|
|
||||||
playerIU.addModifiedItem(newItem);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
playerIU.addNewItem(newItem);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Send updated item list to the player
|
// Send updated item list to the player
|
||||||
if (playerIU != null)
|
player.sendItemList(false);
|
||||||
{
|
|
||||||
player.sendInventoryUpdate(playerIU);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
player.sendItemList(false);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -28,7 +28,6 @@ import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse;
|
|||||||
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
|
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
|
||||||
import org.l2jmobius.gameserver.network.GameClient;
|
import org.l2jmobius.gameserver.network.GameClient;
|
||||||
import org.l2jmobius.gameserver.network.SystemMessageId;
|
import org.l2jmobius.gameserver.network.SystemMessageId;
|
||||||
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
|
|
||||||
import org.l2jmobius.gameserver.util.Util;
|
import org.l2jmobius.gameserver.util.Util;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -159,7 +158,6 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Proceed to the transfer
|
// Proceed to the transfer
|
||||||
final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate();
|
|
||||||
for (ItemHolder i : _items)
|
for (ItemHolder i : _items)
|
||||||
{
|
{
|
||||||
final ItemInstance oldItem = warehouse.getItemByObjectId(i.getId());
|
final ItemInstance oldItem = warehouse.getItemByObjectId(i.getId());
|
||||||
@ -174,28 +172,9 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket
|
|||||||
LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)");
|
LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (playerIU != null)
|
|
||||||
{
|
|
||||||
if (newItem.getCount() > i.getCount())
|
|
||||||
{
|
|
||||||
playerIU.addModifiedItem(newItem);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
playerIU.addNewItem(newItem);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Send updated item list to the player
|
// Send updated item list to the player
|
||||||
if (playerIU != null)
|
player.sendItemList();
|
||||||
{
|
|
||||||
player.sendInventoryUpdate(playerIU);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
player.sendItemList();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -28,7 +28,6 @@ import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse;
|
|||||||
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
|
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
|
||||||
import org.l2jmobius.gameserver.network.GameClient;
|
import org.l2jmobius.gameserver.network.GameClient;
|
||||||
import org.l2jmobius.gameserver.network.SystemMessageId;
|
import org.l2jmobius.gameserver.network.SystemMessageId;
|
||||||
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
|
|
||||||
import org.l2jmobius.gameserver.util.Util;
|
import org.l2jmobius.gameserver.util.Util;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -159,7 +158,6 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Proceed to the transfer
|
// Proceed to the transfer
|
||||||
final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate();
|
|
||||||
for (ItemHolder i : _items)
|
for (ItemHolder i : _items)
|
||||||
{
|
{
|
||||||
final ItemInstance oldItem = warehouse.getItemByObjectId(i.getId());
|
final ItemInstance oldItem = warehouse.getItemByObjectId(i.getId());
|
||||||
@ -174,28 +172,9 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket
|
|||||||
LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)");
|
LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (playerIU != null)
|
|
||||||
{
|
|
||||||
if (newItem.getCount() > i.getCount())
|
|
||||||
{
|
|
||||||
playerIU.addModifiedItem(newItem);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
playerIU.addNewItem(newItem);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Send updated item list to the player
|
// Send updated item list to the player
|
||||||
if (playerIU != null)
|
player.sendItemList();
|
||||||
{
|
|
||||||
player.sendInventoryUpdate(playerIU);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
player.sendItemList();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -28,7 +28,6 @@ import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse;
|
|||||||
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
|
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
|
||||||
import org.l2jmobius.gameserver.network.GameClient;
|
import org.l2jmobius.gameserver.network.GameClient;
|
||||||
import org.l2jmobius.gameserver.network.SystemMessageId;
|
import org.l2jmobius.gameserver.network.SystemMessageId;
|
||||||
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
|
|
||||||
import org.l2jmobius.gameserver.util.Util;
|
import org.l2jmobius.gameserver.util.Util;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -159,7 +158,6 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Proceed to the transfer
|
// Proceed to the transfer
|
||||||
final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate();
|
|
||||||
for (ItemHolder i : _items)
|
for (ItemHolder i : _items)
|
||||||
{
|
{
|
||||||
final ItemInstance oldItem = warehouse.getItemByObjectId(i.getId());
|
final ItemInstance oldItem = warehouse.getItemByObjectId(i.getId());
|
||||||
@ -174,28 +172,9 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket
|
|||||||
LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)");
|
LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (playerIU != null)
|
|
||||||
{
|
|
||||||
if (newItem.getCount() > i.getCount())
|
|
||||||
{
|
|
||||||
playerIU.addModifiedItem(newItem);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
playerIU.addNewItem(newItem);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Send updated item list to the player
|
// Send updated item list to the player
|
||||||
if (playerIU != null)
|
player.sendItemList();
|
||||||
{
|
|
||||||
player.sendInventoryUpdate(playerIU);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
player.sendItemList();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -28,7 +28,6 @@ import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse;
|
|||||||
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
|
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
|
||||||
import org.l2jmobius.gameserver.network.GameClient;
|
import org.l2jmobius.gameserver.network.GameClient;
|
||||||
import org.l2jmobius.gameserver.network.SystemMessageId;
|
import org.l2jmobius.gameserver.network.SystemMessageId;
|
||||||
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
|
|
||||||
import org.l2jmobius.gameserver.util.Util;
|
import org.l2jmobius.gameserver.util.Util;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -159,7 +158,6 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Proceed to the transfer
|
// Proceed to the transfer
|
||||||
final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate();
|
|
||||||
for (ItemHolder i : _items)
|
for (ItemHolder i : _items)
|
||||||
{
|
{
|
||||||
final ItemInstance oldItem = warehouse.getItemByObjectId(i.getId());
|
final ItemInstance oldItem = warehouse.getItemByObjectId(i.getId());
|
||||||
@ -174,28 +172,9 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket
|
|||||||
LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)");
|
LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (playerIU != null)
|
|
||||||
{
|
|
||||||
if (newItem.getCount() > i.getCount())
|
|
||||||
{
|
|
||||||
playerIU.addModifiedItem(newItem);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
playerIU.addNewItem(newItem);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Send updated item list to the player
|
// Send updated item list to the player
|
||||||
if (playerIU != null)
|
player.sendItemList();
|
||||||
{
|
|
||||||
player.sendInventoryUpdate(playerIU);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
player.sendItemList();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -27,7 +27,6 @@ import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse;
|
|||||||
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
|
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
|
||||||
import org.l2jmobius.gameserver.network.GameClient;
|
import org.l2jmobius.gameserver.network.GameClient;
|
||||||
import org.l2jmobius.gameserver.network.SystemMessageId;
|
import org.l2jmobius.gameserver.network.SystemMessageId;
|
||||||
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
|
|
||||||
import org.l2jmobius.gameserver.util.Util;
|
import org.l2jmobius.gameserver.util.Util;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -152,7 +151,6 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Proceed to the transfer
|
// Proceed to the transfer
|
||||||
final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate();
|
|
||||||
for (ItemHolder i : _items)
|
for (ItemHolder i : _items)
|
||||||
{
|
{
|
||||||
final ItemInstance oldItem = warehouse.getItemByObjectId(i.getId());
|
final ItemInstance oldItem = warehouse.getItemByObjectId(i.getId());
|
||||||
@ -168,28 +166,9 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket
|
|||||||
LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)");
|
LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (playerIU != null)
|
|
||||||
{
|
|
||||||
if (newItem.getCount() > i.getCount())
|
|
||||||
{
|
|
||||||
playerIU.addModifiedItem(newItem);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
playerIU.addNewItem(newItem);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Send updated item list to the player
|
// Send updated item list to the player
|
||||||
if (playerIU != null)
|
player.sendItemList();
|
||||||
{
|
|
||||||
player.sendInventoryUpdate(playerIU);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
player.sendItemList();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -27,7 +27,6 @@ import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse;
|
|||||||
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
|
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
|
||||||
import org.l2jmobius.gameserver.network.GameClient;
|
import org.l2jmobius.gameserver.network.GameClient;
|
||||||
import org.l2jmobius.gameserver.network.SystemMessageId;
|
import org.l2jmobius.gameserver.network.SystemMessageId;
|
||||||
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
|
|
||||||
import org.l2jmobius.gameserver.util.Util;
|
import org.l2jmobius.gameserver.util.Util;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -152,7 +151,6 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Proceed to the transfer
|
// Proceed to the transfer
|
||||||
final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate();
|
|
||||||
for (ItemHolder i : _items)
|
for (ItemHolder i : _items)
|
||||||
{
|
{
|
||||||
final ItemInstance oldItem = warehouse.getItemByObjectId(i.getId());
|
final ItemInstance oldItem = warehouse.getItemByObjectId(i.getId());
|
||||||
@ -168,28 +166,9 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket
|
|||||||
LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)");
|
LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (playerIU != null)
|
|
||||||
{
|
|
||||||
if (newItem.getCount() > i.getCount())
|
|
||||||
{
|
|
||||||
playerIU.addModifiedItem(newItem);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
playerIU.addNewItem(newItem);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Send updated item list to the player
|
// Send updated item list to the player
|
||||||
if (playerIU != null)
|
player.sendItemList();
|
||||||
{
|
|
||||||
player.sendInventoryUpdate(playerIU);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
player.sendItemList();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -27,7 +27,6 @@ import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse;
|
|||||||
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
|
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
|
||||||
import org.l2jmobius.gameserver.network.GameClient;
|
import org.l2jmobius.gameserver.network.GameClient;
|
||||||
import org.l2jmobius.gameserver.network.SystemMessageId;
|
import org.l2jmobius.gameserver.network.SystemMessageId;
|
||||||
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
|
|
||||||
import org.l2jmobius.gameserver.util.Util;
|
import org.l2jmobius.gameserver.util.Util;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -152,7 +151,6 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Proceed to the transfer
|
// Proceed to the transfer
|
||||||
final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate();
|
|
||||||
for (ItemHolder i : _items)
|
for (ItemHolder i : _items)
|
||||||
{
|
{
|
||||||
final ItemInstance oldItem = warehouse.getItemByObjectId(i.getId());
|
final ItemInstance oldItem = warehouse.getItemByObjectId(i.getId());
|
||||||
@ -168,28 +166,9 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket
|
|||||||
LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)");
|
LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (playerIU != null)
|
|
||||||
{
|
|
||||||
if (newItem.getCount() > i.getCount())
|
|
||||||
{
|
|
||||||
playerIU.addModifiedItem(newItem);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
playerIU.addNewItem(newItem);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Send updated item list to the player
|
// Send updated item list to the player
|
||||||
if (playerIU != null)
|
player.sendItemList();
|
||||||
{
|
|
||||||
player.sendInventoryUpdate(playerIU);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
player.sendItemList();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -28,7 +28,6 @@ import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse;
|
|||||||
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
|
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
|
||||||
import org.l2jmobius.gameserver.network.GameClient;
|
import org.l2jmobius.gameserver.network.GameClient;
|
||||||
import org.l2jmobius.gameserver.network.SystemMessageId;
|
import org.l2jmobius.gameserver.network.SystemMessageId;
|
||||||
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
|
|
||||||
import org.l2jmobius.gameserver.util.Util;
|
import org.l2jmobius.gameserver.util.Util;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -159,7 +158,6 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Proceed to the transfer
|
// Proceed to the transfer
|
||||||
final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate();
|
|
||||||
for (ItemHolder i : _items)
|
for (ItemHolder i : _items)
|
||||||
{
|
{
|
||||||
final ItemInstance oldItem = warehouse.getItemByObjectId(i.getId());
|
final ItemInstance oldItem = warehouse.getItemByObjectId(i.getId());
|
||||||
@ -174,28 +172,9 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket
|
|||||||
LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)");
|
LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (playerIU != null)
|
|
||||||
{
|
|
||||||
if (newItem.getCount() > i.getCount())
|
|
||||||
{
|
|
||||||
playerIU.addModifiedItem(newItem);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
playerIU.addNewItem(newItem);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Send updated item list to the player
|
// Send updated item list to the player
|
||||||
if (playerIU != null)
|
player.sendItemList(false);
|
||||||
{
|
|
||||||
player.sendInventoryUpdate(playerIU);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
player.sendItemList(false);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -28,7 +28,6 @@ import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse;
|
|||||||
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
|
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
|
||||||
import org.l2jmobius.gameserver.network.GameClient;
|
import org.l2jmobius.gameserver.network.GameClient;
|
||||||
import org.l2jmobius.gameserver.network.SystemMessageId;
|
import org.l2jmobius.gameserver.network.SystemMessageId;
|
||||||
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
|
|
||||||
import org.l2jmobius.gameserver.util.Util;
|
import org.l2jmobius.gameserver.util.Util;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -159,7 +158,6 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Proceed to the transfer
|
// Proceed to the transfer
|
||||||
final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate();
|
|
||||||
for (ItemHolder i : _items)
|
for (ItemHolder i : _items)
|
||||||
{
|
{
|
||||||
final ItemInstance oldItem = warehouse.getItemByObjectId(i.getId());
|
final ItemInstance oldItem = warehouse.getItemByObjectId(i.getId());
|
||||||
@ -174,28 +172,9 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket
|
|||||||
LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)");
|
LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (playerIU != null)
|
|
||||||
{
|
|
||||||
if (newItem.getCount() > i.getCount())
|
|
||||||
{
|
|
||||||
playerIU.addModifiedItem(newItem);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
playerIU.addNewItem(newItem);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Send updated item list to the player
|
// Send updated item list to the player
|
||||||
if (playerIU != null)
|
player.sendItemList(false);
|
||||||
{
|
|
||||||
player.sendInventoryUpdate(playerIU);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
player.sendItemList(false);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -28,7 +28,6 @@ import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse;
|
|||||||
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
|
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
|
||||||
import org.l2jmobius.gameserver.network.GameClient;
|
import org.l2jmobius.gameserver.network.GameClient;
|
||||||
import org.l2jmobius.gameserver.network.SystemMessageId;
|
import org.l2jmobius.gameserver.network.SystemMessageId;
|
||||||
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
|
|
||||||
import org.l2jmobius.gameserver.util.Util;
|
import org.l2jmobius.gameserver.util.Util;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -159,7 +158,6 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Proceed to the transfer
|
// Proceed to the transfer
|
||||||
final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate();
|
|
||||||
for (ItemHolder i : _items)
|
for (ItemHolder i : _items)
|
||||||
{
|
{
|
||||||
final ItemInstance oldItem = warehouse.getItemByObjectId(i.getId());
|
final ItemInstance oldItem = warehouse.getItemByObjectId(i.getId());
|
||||||
@ -174,28 +172,9 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket
|
|||||||
LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)");
|
LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (playerIU != null)
|
|
||||||
{
|
|
||||||
if (newItem.getCount() > i.getCount())
|
|
||||||
{
|
|
||||||
playerIU.addModifiedItem(newItem);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
playerIU.addNewItem(newItem);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Send updated item list to the player
|
// Send updated item list to the player
|
||||||
if (playerIU != null)
|
player.sendItemList();
|
||||||
{
|
|
||||||
player.sendInventoryUpdate(playerIU);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
player.sendItemList();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -28,7 +28,6 @@ import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse;
|
|||||||
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
|
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
|
||||||
import org.l2jmobius.gameserver.network.GameClient;
|
import org.l2jmobius.gameserver.network.GameClient;
|
||||||
import org.l2jmobius.gameserver.network.SystemMessageId;
|
import org.l2jmobius.gameserver.network.SystemMessageId;
|
||||||
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
|
|
||||||
import org.l2jmobius.gameserver.util.Util;
|
import org.l2jmobius.gameserver.util.Util;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -159,7 +158,6 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Proceed to the transfer
|
// Proceed to the transfer
|
||||||
final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate();
|
|
||||||
for (ItemHolder i : _items)
|
for (ItemHolder i : _items)
|
||||||
{
|
{
|
||||||
final ItemInstance oldItem = warehouse.getItemByObjectId(i.getId());
|
final ItemInstance oldItem = warehouse.getItemByObjectId(i.getId());
|
||||||
@ -174,28 +172,9 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket
|
|||||||
LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)");
|
LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (playerIU != null)
|
|
||||||
{
|
|
||||||
if (newItem.getCount() > i.getCount())
|
|
||||||
{
|
|
||||||
playerIU.addModifiedItem(newItem);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
playerIU.addNewItem(newItem);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Send updated item list to the player
|
// Send updated item list to the player
|
||||||
if (playerIU != null)
|
player.sendItemList();
|
||||||
{
|
|
||||||
player.sendInventoryUpdate(playerIU);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
player.sendItemList();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -28,7 +28,6 @@ import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse;
|
|||||||
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
|
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
|
||||||
import org.l2jmobius.gameserver.network.GameClient;
|
import org.l2jmobius.gameserver.network.GameClient;
|
||||||
import org.l2jmobius.gameserver.network.SystemMessageId;
|
import org.l2jmobius.gameserver.network.SystemMessageId;
|
||||||
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
|
|
||||||
import org.l2jmobius.gameserver.util.Util;
|
import org.l2jmobius.gameserver.util.Util;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -159,7 +158,6 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Proceed to the transfer
|
// Proceed to the transfer
|
||||||
final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate();
|
|
||||||
for (ItemHolder i : _items)
|
for (ItemHolder i : _items)
|
||||||
{
|
{
|
||||||
final ItemInstance oldItem = warehouse.getItemByObjectId(i.getId());
|
final ItemInstance oldItem = warehouse.getItemByObjectId(i.getId());
|
||||||
@ -174,28 +172,9 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket
|
|||||||
LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)");
|
LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (playerIU != null)
|
|
||||||
{
|
|
||||||
if (newItem.getCount() > i.getCount())
|
|
||||||
{
|
|
||||||
playerIU.addModifiedItem(newItem);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
playerIU.addNewItem(newItem);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Send updated item list to the player
|
// Send updated item list to the player
|
||||||
if (playerIU != null)
|
player.sendItemList();
|
||||||
{
|
|
||||||
player.sendInventoryUpdate(playerIU);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
player.sendItemList();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -28,7 +28,6 @@ import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse;
|
|||||||
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
|
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
|
||||||
import org.l2jmobius.gameserver.network.GameClient;
|
import org.l2jmobius.gameserver.network.GameClient;
|
||||||
import org.l2jmobius.gameserver.network.SystemMessageId;
|
import org.l2jmobius.gameserver.network.SystemMessageId;
|
||||||
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
|
|
||||||
import org.l2jmobius.gameserver.util.Util;
|
import org.l2jmobius.gameserver.util.Util;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -159,7 +158,6 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Proceed to the transfer
|
// Proceed to the transfer
|
||||||
final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate();
|
|
||||||
for (ItemHolder i : _items)
|
for (ItemHolder i : _items)
|
||||||
{
|
{
|
||||||
final ItemInstance oldItem = warehouse.getItemByObjectId(i.getId());
|
final ItemInstance oldItem = warehouse.getItemByObjectId(i.getId());
|
||||||
@ -174,28 +172,9 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket
|
|||||||
LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)");
|
LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (playerIU != null)
|
|
||||||
{
|
|
||||||
if (newItem.getCount() > i.getCount())
|
|
||||||
{
|
|
||||||
playerIU.addModifiedItem(newItem);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
playerIU.addNewItem(newItem);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Send updated item list to the player
|
// Send updated item list to the player
|
||||||
if (playerIU != null)
|
player.sendItemList();
|
||||||
{
|
|
||||||
player.sendInventoryUpdate(playerIU);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
player.sendItemList();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -28,7 +28,6 @@ import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse;
|
|||||||
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
|
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
|
||||||
import org.l2jmobius.gameserver.network.GameClient;
|
import org.l2jmobius.gameserver.network.GameClient;
|
||||||
import org.l2jmobius.gameserver.network.SystemMessageId;
|
import org.l2jmobius.gameserver.network.SystemMessageId;
|
||||||
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
|
|
||||||
import org.l2jmobius.gameserver.util.Util;
|
import org.l2jmobius.gameserver.util.Util;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -159,7 +158,6 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Proceed to the transfer
|
// Proceed to the transfer
|
||||||
final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate();
|
|
||||||
for (ItemHolder i : _items)
|
for (ItemHolder i : _items)
|
||||||
{
|
{
|
||||||
final ItemInstance oldItem = warehouse.getItemByObjectId(i.getId());
|
final ItemInstance oldItem = warehouse.getItemByObjectId(i.getId());
|
||||||
@ -174,28 +172,9 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket
|
|||||||
LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)");
|
LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (playerIU != null)
|
|
||||||
{
|
|
||||||
if (newItem.getCount() > i.getCount())
|
|
||||||
{
|
|
||||||
playerIU.addModifiedItem(newItem);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
playerIU.addNewItem(newItem);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Send updated item list to the player
|
// Send updated item list to the player
|
||||||
if (playerIU != null)
|
player.sendItemList(false);
|
||||||
{
|
|
||||||
player.sendInventoryUpdate(playerIU);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
player.sendItemList(false);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -27,7 +27,6 @@ import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse;
|
|||||||
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
|
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
|
||||||
import org.l2jmobius.gameserver.network.GameClient;
|
import org.l2jmobius.gameserver.network.GameClient;
|
||||||
import org.l2jmobius.gameserver.network.SystemMessageId;
|
import org.l2jmobius.gameserver.network.SystemMessageId;
|
||||||
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
|
|
||||||
import org.l2jmobius.gameserver.util.Util;
|
import org.l2jmobius.gameserver.util.Util;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -152,7 +151,6 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Proceed to the transfer
|
// Proceed to the transfer
|
||||||
final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate();
|
|
||||||
for (ItemHolder i : _items)
|
for (ItemHolder i : _items)
|
||||||
{
|
{
|
||||||
final ItemInstance oldItem = warehouse.getItemByObjectId(i.getId());
|
final ItemInstance oldItem = warehouse.getItemByObjectId(i.getId());
|
||||||
@ -168,28 +166,9 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket
|
|||||||
LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)");
|
LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (playerIU != null)
|
|
||||||
{
|
|
||||||
if (newItem.getCount() > i.getCount())
|
|
||||||
{
|
|
||||||
playerIU.addModifiedItem(newItem);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
playerIU.addNewItem(newItem);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Send updated item list to the player
|
// Send updated item list to the player
|
||||||
if (playerIU != null)
|
player.sendItemList();
|
||||||
{
|
|
||||||
player.sendInventoryUpdate(playerIU);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
player.sendItemList();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -27,7 +27,6 @@ import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse;
|
|||||||
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
|
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
|
||||||
import org.l2jmobius.gameserver.network.GameClient;
|
import org.l2jmobius.gameserver.network.GameClient;
|
||||||
import org.l2jmobius.gameserver.network.SystemMessageId;
|
import org.l2jmobius.gameserver.network.SystemMessageId;
|
||||||
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
|
|
||||||
import org.l2jmobius.gameserver.util.Util;
|
import org.l2jmobius.gameserver.util.Util;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -152,7 +151,6 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Proceed to the transfer
|
// Proceed to the transfer
|
||||||
final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate();
|
|
||||||
for (ItemHolder i : _items)
|
for (ItemHolder i : _items)
|
||||||
{
|
{
|
||||||
final ItemInstance oldItem = warehouse.getItemByObjectId(i.getId());
|
final ItemInstance oldItem = warehouse.getItemByObjectId(i.getId());
|
||||||
@ -168,28 +166,9 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket
|
|||||||
LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)");
|
LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (playerIU != null)
|
|
||||||
{
|
|
||||||
if (newItem.getCount() > i.getCount())
|
|
||||||
{
|
|
||||||
playerIU.addModifiedItem(newItem);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
playerIU.addNewItem(newItem);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Send updated item list to the player
|
// Send updated item list to the player
|
||||||
if (playerIU != null)
|
player.sendItemList();
|
||||||
{
|
|
||||||
player.sendInventoryUpdate(playerIU);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
player.sendItemList();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -27,7 +27,6 @@ import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse;
|
|||||||
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
|
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
|
||||||
import org.l2jmobius.gameserver.network.GameClient;
|
import org.l2jmobius.gameserver.network.GameClient;
|
||||||
import org.l2jmobius.gameserver.network.SystemMessageId;
|
import org.l2jmobius.gameserver.network.SystemMessageId;
|
||||||
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
|
|
||||||
import org.l2jmobius.gameserver.util.Util;
|
import org.l2jmobius.gameserver.util.Util;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -152,7 +151,6 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Proceed to the transfer
|
// Proceed to the transfer
|
||||||
final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate();
|
|
||||||
for (ItemHolder i : _items)
|
for (ItemHolder i : _items)
|
||||||
{
|
{
|
||||||
final ItemInstance oldItem = warehouse.getItemByObjectId(i.getId());
|
final ItemInstance oldItem = warehouse.getItemByObjectId(i.getId());
|
||||||
@ -168,28 +166,9 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket
|
|||||||
LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)");
|
LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (playerIU != null)
|
|
||||||
{
|
|
||||||
if (newItem.getCount() > i.getCount())
|
|
||||||
{
|
|
||||||
playerIU.addModifiedItem(newItem);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
playerIU.addNewItem(newItem);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Send updated item list to the player
|
// Send updated item list to the player
|
||||||
if (playerIU != null)
|
player.sendItemList();
|
||||||
{
|
|
||||||
player.sendInventoryUpdate(playerIU);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
player.sendItemList();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user