Addition of missing RequestSellItem custom sell buylist check.

Contributed by secaolol.
This commit is contained in:
MobiusDevelopment 2020-03-11 09:04:45 +00:00
parent 58a85d05f5
commit 904c6be328
17 changed files with 15 additions and 32 deletions

View File

@ -57,7 +57,6 @@ public class RequestSellItem implements IClientIncomingPacket
{
return false;
}
_items = new ArrayList<>(size);
for (int i = 0; i < size; i++)
{
@ -122,7 +121,7 @@ public class RequestSellItem implements IClientIncomingPacket
}
}
if ((merchant == null) && !player.isGM())
if ((merchant == null) && !player.isGM() && (_listId != CUSTOM_CB_SELL_LIST))
{
client.sendPacket(ActionFailed.STATIC_PACKET);
return;

View File

@ -57,7 +57,6 @@ public class RequestSellItem implements IClientIncomingPacket
{
return false;
}
_items = new ArrayList<>(size);
for (int i = 0; i < size; i++)
{
@ -122,7 +121,7 @@ public class RequestSellItem implements IClientIncomingPacket
}
}
if ((merchant == null) && !player.isGM())
if ((merchant == null) && !player.isGM() && (_listId != CUSTOM_CB_SELL_LIST))
{
client.sendPacket(ActionFailed.STATIC_PACKET);
return;

View File

@ -57,7 +57,6 @@ public class RequestSellItem implements IClientIncomingPacket
{
return false;
}
_items = new ArrayList<>(size);
for (int i = 0; i < size; i++)
{
@ -122,7 +121,7 @@ public class RequestSellItem implements IClientIncomingPacket
}
}
if ((merchant == null) && !player.isGM())
if ((merchant == null) && !player.isGM() && (_listId != CUSTOM_CB_SELL_LIST))
{
client.sendPacket(ActionFailed.STATIC_PACKET);
return;

View File

@ -57,7 +57,6 @@ public class RequestSellItem implements IClientIncomingPacket
{
return false;
}
_items = new ArrayList<>(size);
for (int i = 0; i < size; i++)
{
@ -122,7 +121,7 @@ public class RequestSellItem implements IClientIncomingPacket
}
}
if ((merchant == null) && !player.isGM())
if ((merchant == null) && !player.isGM() && (_listId != CUSTOM_CB_SELL_LIST))
{
client.sendPacket(ActionFailed.STATIC_PACKET);
return;

View File

@ -57,7 +57,6 @@ public class RequestSellItem implements IClientIncomingPacket
{
return false;
}
_items = new ArrayList<>(size);
for (int i = 0; i < size; i++)
{
@ -122,7 +121,7 @@ public class RequestSellItem implements IClientIncomingPacket
}
}
if ((merchant == null) && !player.isGM())
if ((merchant == null) && !player.isGM() && (_listId != CUSTOM_CB_SELL_LIST))
{
client.sendPacket(ActionFailed.STATIC_PACKET);
return;

View File

@ -57,7 +57,6 @@ public class RequestSellItem implements IClientIncomingPacket
{
return false;
}
_items = new ArrayList<>(size);
for (int i = 0; i < size; i++)
{
@ -122,7 +121,7 @@ public class RequestSellItem implements IClientIncomingPacket
}
}
if ((merchant == null) && !player.isGM())
if ((merchant == null) && !player.isGM() && (_listId != CUSTOM_CB_SELL_LIST))
{
client.sendPacket(ActionFailed.STATIC_PACKET);
return;

View File

@ -57,7 +57,6 @@ public class RequestSellItem implements IClientIncomingPacket
{
return false;
}
_items = new ArrayList<>(size);
for (int i = 0; i < size; i++)
{
@ -122,7 +121,7 @@ public class RequestSellItem implements IClientIncomingPacket
}
}
if ((merchant == null) && !player.isGM())
if ((merchant == null) && !player.isGM() && (_listId != CUSTOM_CB_SELL_LIST))
{
client.sendPacket(ActionFailed.STATIC_PACKET);
return;

View File

@ -57,7 +57,6 @@ public class RequestSellItem implements IClientIncomingPacket
{
return false;
}
_items = new ArrayList<>(size);
for (int i = 0; i < size; i++)
{
@ -122,7 +121,7 @@ public class RequestSellItem implements IClientIncomingPacket
}
}
if ((merchant == null) && !player.isGM())
if ((merchant == null) && !player.isGM() && (_listId != CUSTOM_CB_SELL_LIST))
{
client.sendPacket(ActionFailed.STATIC_PACKET);
return;

View File

@ -58,7 +58,6 @@ public class RequestSellItem implements IClientIncomingPacket
{
return false;
}
_items = new ArrayList<>(size);
for (int i = 0; i < size; i++)
{

View File

@ -58,7 +58,6 @@ public class RequestSellItem implements IClientIncomingPacket
{
return false;
}
_items = new ArrayList<>(size);
for (int i = 0; i < size; i++)
{

View File

@ -57,7 +57,6 @@ public class RequestSellItem implements IClientIncomingPacket
{
return false;
}
_items = new ArrayList<>(size);
for (int i = 0; i < size; i++)
{
@ -122,7 +121,7 @@ public class RequestSellItem implements IClientIncomingPacket
}
}
if ((merchant == null) && !player.isGM())
if ((merchant == null) && !player.isGM() && (_listId != CUSTOM_CB_SELL_LIST))
{
client.sendPacket(ActionFailed.STATIC_PACKET);
return;

View File

@ -57,7 +57,6 @@ public class RequestSellItem implements IClientIncomingPacket
{
return false;
}
_items = new ArrayList<>(size);
for (int i = 0; i < size; i++)
{
@ -122,7 +121,7 @@ public class RequestSellItem implements IClientIncomingPacket
}
}
if ((merchant == null) && !player.isGM())
if ((merchant == null) && !player.isGM() && (_listId != CUSTOM_CB_SELL_LIST))
{
client.sendPacket(ActionFailed.STATIC_PACKET);
return;

View File

@ -57,7 +57,6 @@ public class RequestSellItem implements IClientIncomingPacket
{
return false;
}
_items = new ArrayList<>(size);
for (int i = 0; i < size; i++)
{
@ -122,7 +121,7 @@ public class RequestSellItem implements IClientIncomingPacket
}
}
if ((merchant == null) && !player.isGM())
if ((merchant == null) && !player.isGM() && (_listId != CUSTOM_CB_SELL_LIST))
{
client.sendPacket(ActionFailed.STATIC_PACKET);
return;

View File

@ -57,7 +57,6 @@ public class RequestSellItem implements IClientIncomingPacket
{
return false;
}
_items = new ArrayList<>(size);
for (int i = 0; i < size; i++)
{
@ -122,7 +121,7 @@ public class RequestSellItem implements IClientIncomingPacket
}
}
if ((merchant == null) && !player.isGM())
if ((merchant == null) && !player.isGM() && (_listId != CUSTOM_CB_SELL_LIST))
{
client.sendPacket(ActionFailed.STATIC_PACKET);
return;

View File

@ -57,7 +57,6 @@ public class RequestSellItem implements IClientIncomingPacket
{
return false;
}
_items = new ArrayList<>(size);
for (int i = 0; i < size; i++)
{
@ -122,7 +121,7 @@ public class RequestSellItem implements IClientIncomingPacket
}
}
if ((merchant == null) && !player.isGM())
if ((merchant == null) && !player.isGM() && (_listId != CUSTOM_CB_SELL_LIST))
{
client.sendPacket(ActionFailed.STATIC_PACKET);
return;

View File

@ -57,7 +57,6 @@ public class RequestSellItem implements IClientIncomingPacket
{
return false;
}
_items = new ArrayList<>(size);
for (int i = 0; i < size; i++)
{
@ -122,7 +121,7 @@ public class RequestSellItem implements IClientIncomingPacket
}
}
if ((merchant == null) && !player.isGM())
if ((merchant == null) && !player.isGM() && (_listId != CUSTOM_CB_SELL_LIST))
{
client.sendPacket(ActionFailed.STATIC_PACKET);
return;

View File

@ -57,7 +57,6 @@ public class RequestSellItem implements IClientIncomingPacket
{
return false;
}
_items = new ArrayList<>(size);
for (int i = 0; i < size; i++)
{
@ -122,7 +121,7 @@ public class RequestSellItem implements IClientIncomingPacket
}
}
if ((merchant == null) && !player.isGM())
if ((merchant == null) && !player.isGM() && (_listId != CUSTOM_CB_SELL_LIST))
{
client.sendPacket(ActionFailed.STATIC_PACKET);
return;