From 54e8a8038742a0b439caaccbba14ae17725740b0 Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Wed, 1 Apr 2015 16:38:27 +0000 Subject: [PATCH] Sell fix for custom CB shop. --- .../gameserver/network/clientpackets/RequestBuyItem.java | 6 ++++-- .../gameserver/network/clientpackets/RequestSellItem.java | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestBuyItem.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestBuyItem.java index 17fe4d8152..4950c0ba47 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestBuyItem.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestBuyItem.java @@ -45,6 +45,8 @@ public final class RequestBuyItem extends L2GameClientPacket private static final String _C__40_REQUESTBUYITEM = "[C] 40 RequestBuyItem"; private static final int BATCH_LENGTH = 12; + private static final int CUSTOM_CB_SELL_LIST = 423; + private int _listId; private List _items = null; @@ -102,7 +104,7 @@ public final class RequestBuyItem extends L2GameClientPacket L2Object target = player.getTarget(); L2Character merchant = null; - if (!player.isGM()) + if (!player.isGM() && (_listId != CUSTOM_CB_SELL_LIST)) { if (!(target instanceof L2MerchantInstance) || (!player.isInsideRadius(target, INTERACTION_DISTANCE, true, false)) || (player.getInstanceId() != target.getInstanceId())) { @@ -115,7 +117,7 @@ public final class RequestBuyItem extends L2GameClientPacket double castleTaxRate = 0; double baseTaxRate = 0; - if ((merchant == null) && !player.isGM()) + if ((merchant == null) && !player.isGM() && (_listId != CUSTOM_CB_SELL_LIST)) { sendPacket(ActionFailed.STATIC_PACKET); return; diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestSellItem.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestSellItem.java index d8cde24b9d..42ac43b6cf 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestSellItem.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestSellItem.java @@ -46,6 +46,7 @@ public final class RequestSellItem extends L2GameClientPacket private static final String _C__37_REQUESTSELLITEM = "[C] 37 RequestSellItem"; private static final int BATCH_LENGTH = 16; + private static final int CUSTOM_CB_SELL_LIST = 423; private int _listId; private List _items = null; @@ -111,7 +112,7 @@ public final class RequestSellItem extends L2GameClientPacket L2Object target = player.getTarget(); L2Character merchant = null; - if (!player.isGM()) + if (!player.isGM() && (_listId != CUSTOM_CB_SELL_LIST)) { if ((target == null) || (!player.isInsideRadius(target, INTERACTION_DISTANCE, true, false)) || (player.getInstanceId() != target.getInstanceId())) { @@ -129,7 +130,7 @@ public final class RequestSellItem extends L2GameClientPacket } } - if ((merchant == null) && !player.isGM()) + if ((merchant == null) && !player.isGM() && (_listId != CUSTOM_CB_SELL_LIST)) { sendPacket(ActionFailed.STATIC_PACKET); return;