From 69fd2036334ea5d73c36653d753779294dc3f953 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sat, 19 Jun 2021 21:05:57 +0000 Subject: [PATCH] Fixed game assistant package deposit. --- .../others/GameAssistant/GameAssistant.java | 25 ++++++++----------- .../clientpackets/RequestPackageSend.java | 9 +------ .../SendWareHouseWithDrawList.java | 10 ++------ .../others/GameAssistant/GameAssistant.java | 25 ++++++++----------- .../clientpackets/RequestPackageSend.java | 9 +------ .../SendWareHouseWithDrawList.java | 10 ++------ .../others/GameAssistant/GameAssistant.java | 25 ++++++++----------- .../clientpackets/RequestPackageSend.java | 9 +------ .../SendWareHouseWithDrawList.java | 10 ++------ .../others/GameAssistant/GameAssistant.java | 25 ++++++++----------- .../clientpackets/RequestPackageSend.java | 9 +------ .../SendWareHouseWithDrawList.java | 10 ++------ 12 files changed, 56 insertions(+), 120 deletions(-) diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java index d00608b8c7..3c0d7398e1 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java @@ -185,25 +185,22 @@ public class GameAssistant extends AbstractNpcAI case "package_withdraw": { final PlayerFreight freight = player.getFreight(); - if (freight != null) + if ((freight != null) && (freight.getSize() > 0)) { - if (freight.getSize() > 0) + player.setActiveWarehouse(freight); + for (ItemInstance i : player.getActiveWarehouse().getItems()) { - player.setActiveWarehouse(freight); - for (ItemInstance i : player.getActiveWarehouse().getItems()) + if (i.isTimeLimitedItem() && (i.getRemainingTime() <= 0)) { - if (i.isTimeLimitedItem() && (i.getRemainingTime() <= 0)) - { - player.getActiveWarehouse().destroyItem("ItemInstance", i, player, null); - } + player.getActiveWarehouse().destroyItem("ItemInstance", i, player, null); } - player.sendPacket(new WareHouseWithdrawalList(1, player, WareHouseWithdrawalList.FREIGHT)); - player.sendPacket(new WareHouseWithdrawalList(2, player, WareHouseWithdrawalList.FREIGHT)); - } - else - { - player.sendPacket(SystemMessageId.YOU_HAVE_NOT_DEPOSITED_ANY_ITEMS_IN_YOUR_WAREHOUSE); } + player.sendPacket(new WareHouseWithdrawalList(1, player, WareHouseWithdrawalList.FREIGHT)); + player.sendPacket(new WareHouseWithdrawalList(2, player, WareHouseWithdrawalList.FREIGHT)); + } + else + { + player.sendPacket(SystemMessageId.YOU_HAVE_NOT_DEPOSITED_ANY_ITEMS_IN_YOUR_WAREHOUSE); } break; } diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 78e99967ee..1821d74f6f 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; @@ -84,12 +83,6 @@ public class RequestPackageSend implements IClientIncomingPacket return; } - final Npc manager = player.getLastFolkNPC(); - if (((manager == null) || !player.isInsideRadius2D(manager, Npc.INTERACTION_DISTANCE))) - { - return; - } - if (player.hasItemRequest()) { Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); @@ -154,7 +147,7 @@ public class RequestPackageSend implements IClientIncomingPacket } // Check if enough adena and charge the fee - if ((currentAdena < fee) || !player.reduceAdena(warehouse.getName(), fee, manager, false)) + if ((currentAdena < fee) || !player.reduceAdena(warehouse.getName(), fee, player, false)) { player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA); warehouse.deleteMe(); diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index 5e78128764..a721d3d996 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.holders.ItemHolder; @@ -90,12 +89,6 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket return; } - final Npc manager = player.getLastFolkNPC(); - if (((manager == null) || !manager.isWarehouse() || !manager.canInteract(player)) && !player.isGM()) - { - return; - } - if (!(warehouse instanceof PlayerWarehouse) && !player.getAccessLevel().allowTransaction()) { player.sendMessage("Transactions are disabled for your Access Level."); @@ -168,7 +161,8 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (olditem == null)"); return; } - final ItemInstance newItem = warehouse.transferItem(warehouse.getName(), i.getId(), i.getCount(), player.getInventory(), player, manager); + + final ItemInstance newItem = warehouse.transferItem(warehouse.getName(), i.getId(), i.getCount(), player.getInventory(), player, player.getLastFolkNPC()); if (newItem == null) { LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)"); diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java index d00608b8c7..3c0d7398e1 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java @@ -185,25 +185,22 @@ public class GameAssistant extends AbstractNpcAI case "package_withdraw": { final PlayerFreight freight = player.getFreight(); - if (freight != null) + if ((freight != null) && (freight.getSize() > 0)) { - if (freight.getSize() > 0) + player.setActiveWarehouse(freight); + for (ItemInstance i : player.getActiveWarehouse().getItems()) { - player.setActiveWarehouse(freight); - for (ItemInstance i : player.getActiveWarehouse().getItems()) + if (i.isTimeLimitedItem() && (i.getRemainingTime() <= 0)) { - if (i.isTimeLimitedItem() && (i.getRemainingTime() <= 0)) - { - player.getActiveWarehouse().destroyItem("ItemInstance", i, player, null); - } + player.getActiveWarehouse().destroyItem("ItemInstance", i, player, null); } - player.sendPacket(new WareHouseWithdrawalList(1, player, WareHouseWithdrawalList.FREIGHT)); - player.sendPacket(new WareHouseWithdrawalList(2, player, WareHouseWithdrawalList.FREIGHT)); - } - else - { - player.sendPacket(SystemMessageId.YOU_HAVE_NOT_DEPOSITED_ANY_ITEMS_IN_YOUR_WAREHOUSE); } + player.sendPacket(new WareHouseWithdrawalList(1, player, WareHouseWithdrawalList.FREIGHT)); + player.sendPacket(new WareHouseWithdrawalList(2, player, WareHouseWithdrawalList.FREIGHT)); + } + else + { + player.sendPacket(SystemMessageId.YOU_HAVE_NOT_DEPOSITED_ANY_ITEMS_IN_YOUR_WAREHOUSE); } break; } diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 78e99967ee..1821d74f6f 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; @@ -84,12 +83,6 @@ public class RequestPackageSend implements IClientIncomingPacket return; } - final Npc manager = player.getLastFolkNPC(); - if (((manager == null) || !player.isInsideRadius2D(manager, Npc.INTERACTION_DISTANCE))) - { - return; - } - if (player.hasItemRequest()) { Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); @@ -154,7 +147,7 @@ public class RequestPackageSend implements IClientIncomingPacket } // Check if enough adena and charge the fee - if ((currentAdena < fee) || !player.reduceAdena(warehouse.getName(), fee, manager, false)) + if ((currentAdena < fee) || !player.reduceAdena(warehouse.getName(), fee, player, false)) { player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA); warehouse.deleteMe(); diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index 5e78128764..a721d3d996 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.holders.ItemHolder; @@ -90,12 +89,6 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket return; } - final Npc manager = player.getLastFolkNPC(); - if (((manager == null) || !manager.isWarehouse() || !manager.canInteract(player)) && !player.isGM()) - { - return; - } - if (!(warehouse instanceof PlayerWarehouse) && !player.getAccessLevel().allowTransaction()) { player.sendMessage("Transactions are disabled for your Access Level."); @@ -168,7 +161,8 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (olditem == null)"); return; } - final ItemInstance newItem = warehouse.transferItem(warehouse.getName(), i.getId(), i.getCount(), player.getInventory(), player, manager); + + final ItemInstance newItem = warehouse.transferItem(warehouse.getName(), i.getId(), i.getCount(), player.getInventory(), player, player.getLastFolkNPC()); if (newItem == null) { LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)"); diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java index cc82ebd24c..a61de1a05d 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java @@ -129,25 +129,22 @@ public class GameAssistant extends AbstractNpcAI case "package_withdraw": { final PlayerFreight freight = player.getFreight(); - if (freight != null) + if ((freight != null) && (freight.getSize() > 0)) { - if (freight.getSize() > 0) + player.setActiveWarehouse(freight); + for (ItemInstance i : player.getActiveWarehouse().getItems()) { - player.setActiveWarehouse(freight); - for (ItemInstance i : player.getActiveWarehouse().getItems()) + if (i.isTimeLimitedItem() && (i.getRemainingTime() <= 0)) { - if (i.isTimeLimitedItem() && (i.getRemainingTime() <= 0)) - { - player.getActiveWarehouse().destroyItem("ItemInstance", i, player, null); - } + player.getActiveWarehouse().destroyItem("ItemInstance", i, player, null); } - player.sendPacket(new WareHouseWithdrawalList(1, player, WareHouseWithdrawalList.FREIGHT)); - player.sendPacket(new WareHouseWithdrawalList(2, player, WareHouseWithdrawalList.FREIGHT)); - } - else - { - player.sendPacket(SystemMessageId.YOU_HAVE_NOT_DEPOSITED_ANY_ITEMS_IN_YOUR_WAREHOUSE); } + player.sendPacket(new WareHouseWithdrawalList(1, player, WareHouseWithdrawalList.FREIGHT)); + player.sendPacket(new WareHouseWithdrawalList(2, player, WareHouseWithdrawalList.FREIGHT)); + } + else + { + player.sendPacket(SystemMessageId.YOU_HAVE_NOT_DEPOSITED_ANY_ITEMS_IN_YOUR_WAREHOUSE); } break; } diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 78e99967ee..1821d74f6f 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; @@ -84,12 +83,6 @@ public class RequestPackageSend implements IClientIncomingPacket return; } - final Npc manager = player.getLastFolkNPC(); - if (((manager == null) || !player.isInsideRadius2D(manager, Npc.INTERACTION_DISTANCE))) - { - return; - } - if (player.hasItemRequest()) { Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); @@ -154,7 +147,7 @@ public class RequestPackageSend implements IClientIncomingPacket } // Check if enough adena and charge the fee - if ((currentAdena < fee) || !player.reduceAdena(warehouse.getName(), fee, manager, false)) + if ((currentAdena < fee) || !player.reduceAdena(warehouse.getName(), fee, player, false)) { player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA); warehouse.deleteMe(); diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index 5e78128764..a721d3d996 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.holders.ItemHolder; @@ -90,12 +89,6 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket return; } - final Npc manager = player.getLastFolkNPC(); - if (((manager == null) || !manager.isWarehouse() || !manager.canInteract(player)) && !player.isGM()) - { - return; - } - if (!(warehouse instanceof PlayerWarehouse) && !player.getAccessLevel().allowTransaction()) { player.sendMessage("Transactions are disabled for your Access Level."); @@ -168,7 +161,8 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (olditem == null)"); return; } - final ItemInstance newItem = warehouse.transferItem(warehouse.getName(), i.getId(), i.getCount(), player.getInventory(), player, manager); + + final ItemInstance newItem = warehouse.transferItem(warehouse.getName(), i.getId(), i.getCount(), player.getInventory(), player, player.getLastFolkNPC()); if (newItem == null) { LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)"); diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java index 555d0fa22c..8d5800cac3 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java +++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java @@ -105,25 +105,22 @@ public class GameAssistant extends AbstractNpcAI case "package_withdraw": { final PlayerFreight freight = player.getFreight(); - if (freight != null) + if ((freight != null) && (freight.getSize() > 0)) { - if (freight.getSize() > 0) + player.setActiveWarehouse(freight); + for (ItemInstance i : player.getActiveWarehouse().getItems()) { - player.setActiveWarehouse(freight); - for (ItemInstance i : player.getActiveWarehouse().getItems()) + if (i.isTimeLimitedItem() && (i.getRemainingTime() <= 0)) { - if (i.isTimeLimitedItem() && (i.getRemainingTime() <= 0)) - { - player.getActiveWarehouse().destroyItem("ItemInstance", i, player, null); - } + player.getActiveWarehouse().destroyItem("ItemInstance", i, player, null); } - player.sendPacket(new WareHouseWithdrawalList(1, player, WareHouseWithdrawalList.FREIGHT)); - player.sendPacket(new WareHouseWithdrawalList(2, player, WareHouseWithdrawalList.FREIGHT)); - } - else - { - player.sendPacket(SystemMessageId.YOU_HAVE_NOT_DEPOSITED_ANY_ITEMS_IN_YOUR_WAREHOUSE); } + player.sendPacket(new WareHouseWithdrawalList(1, player, WareHouseWithdrawalList.FREIGHT)); + player.sendPacket(new WareHouseWithdrawalList(2, player, WareHouseWithdrawalList.FREIGHT)); + } + else + { + player.sendPacket(SystemMessageId.YOU_HAVE_NOT_DEPOSITED_ANY_ITEMS_IN_YOUR_WAREHOUSE); } break; } diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 78e99967ee..1821d74f6f 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; @@ -84,12 +83,6 @@ public class RequestPackageSend implements IClientIncomingPacket return; } - final Npc manager = player.getLastFolkNPC(); - if (((manager == null) || !player.isInsideRadius2D(manager, Npc.INTERACTION_DISTANCE))) - { - return; - } - if (player.hasItemRequest()) { Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); @@ -154,7 +147,7 @@ public class RequestPackageSend implements IClientIncomingPacket } // Check if enough adena and charge the fee - if ((currentAdena < fee) || !player.reduceAdena(warehouse.getName(), fee, manager, false)) + if ((currentAdena < fee) || !player.reduceAdena(warehouse.getName(), fee, player, false)) { player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA); warehouse.deleteMe(); diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index c483e31c2b..eedb1eb24c 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.holders.ItemHolder; @@ -90,12 +89,6 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket return; } - final Npc manager = player.getLastFolkNPC(); - if (((manager == null) || !manager.isWarehouse() || !manager.canInteract(player)) && !player.isGM()) - { - return; - } - if (!(warehouse instanceof PlayerWarehouse) && !player.getAccessLevel().allowTransaction()) { player.sendMessage("Transactions are disabled for your Access Level."); @@ -168,7 +161,8 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (olditem == null)"); return; } - final ItemInstance newItem = warehouse.transferItem(warehouse.getName(), i.getId(), i.getCount(), player.getInventory(), player, manager); + + final ItemInstance newItem = warehouse.transferItem(warehouse.getName(), i.getId(), i.getCount(), player.getInventory(), player, player.getLastFolkNPC()); if (newItem == null) { LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)");