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

Added some checks on RequestSellItem.

Browse Source
This commit is contained in:
MobiusDevelopment 2022-01-19 23:12:48 +00:00
parent 229f7a61a7
commit 0d5785b2aa
2 changed files with 22 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
View File

@ -40,9 +40,6 @@ public class RequestSellItem implements IClientIncomingPacket
private int _count; private int _count;
private int[] _items; // count*3 private int[] _items; // count*3
/**
* packet type id 0x1e sample 1e 00 00 00 00 // list id 02 00 00 00 // number of items 71 72 00 10 // object id ea 05 00 00 // item id 01 00 00 00 // item count 76 4b 00 10 // object id 2e 0a 00 00 // item id 01 00 00 00 // item count format: cdd (ddd)
*/
@Override @Override
public boolean read(GameClient client, PacketReader packet) public boolean read(GameClient client, PacketReader packet)
{ {
@ -88,18 +85,23 @@ public class RequestSellItem implements IClientIncomingPacket
return; return;
} }
if (_items == null)
{
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// Alt game - Karma punishment // Alt game - Karma punishment
if (!Config.ALT_GAME_KARMA_PLAYER_CAN_SHOP && (player.getKarma() > 0)) if (!Config.ALT_GAME_KARMA_PLAYER_CAN_SHOP && (player.getKarma() > 0))
{ {
player.sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
final WorldObject target = player.getTarget(); final WorldObject target = player.getTarget();
if (!player.isGM() && ((target == null) // No target (ie GM Shop) if (!player.isGM() && (!(target instanceof Merchant) || !player.isInsideRadius2D(target, Npc.INTERACTION_DISTANCE)))
|| !(target instanceof Merchant) // Target not a merchant and not mercmanager
|| !player.isInsideRadius2D(target, Npc.INTERACTION_DISTANCE)))
{ {
return; // Distance is too far return;
} }
String htmlFolder = ""; String htmlFolder = "";
@ -129,18 +131,16 @@ public class RequestSellItem implements IClientIncomingPacket
// Proceed the sell // Proceed the sell
for (int i = 0; i < _count; i++) for (int i = 0; i < _count; i++)
{ {
final int objectId = _items[(i * 3) + 0];
final int count = _items[(i * 3) + 2];
// Check count // Check count
final int count = _items[(i * 3) + 2];
if ((count <= 0) || (count > Integer.MAX_VALUE)) if ((count <= 0) || (count > Integer.MAX_VALUE))
{ {
// Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " tried to purchase over " + Integer.MAX_VALUE + " items at the same time.", Config.DEFAULT_PUNISH);
player.sendPacket(new SystemMessage(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED)); player.sendPacket(new SystemMessage(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED));
return; return;
} }
// Check Item // Check Item
final int objectId = _items[i * 3];
final Item item = player.checkItemManipulation(objectId, count, "sell"); final Item item = player.checkItemManipulation(objectId, count, "sell");
if ((item == null) || !item.getItem().isSellable() || (item.getItemLocation() != ItemLocation.INVENTORY)) if ((item == null) || !item.getItem().isSellable() || (item.getItemLocation() != ItemLocation.INVENTORY))
{ {
@ -153,7 +153,6 @@ public class RequestSellItem implements IClientIncomingPacket
// Fix exploit during Sell // Fix exploit during Sell
if (((Integer.MAX_VALUE / count) < price) || (totalPrice > Integer.MAX_VALUE)) if (((Integer.MAX_VALUE / count) < price) || (totalPrice > Integer.MAX_VALUE))
{ {
// Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " tried to purchase over " + MAX_ADENA + " adena worth of goods.", Config.DEFAULT_PUNISH);
player.sendPacket(new SystemMessage(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED)); player.sendPacket(new SystemMessage(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED));
return; return;
} }
@ -161,7 +160,6 @@ public class RequestSellItem implements IClientIncomingPacket
// Check totalPrice // Check totalPrice
if (totalPrice <= 0) if (totalPrice <= 0)
{ {
// Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " tried to purchase over " + Integer.MAX_VALUE + " adena worth of goods.", Config.DEFAULT_PUNISH);
player.sendPacket(new SystemMessage(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED)); player.sendPacket(new SystemMessage(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED));
return; return;
} }

24
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
View File

@ -40,9 +40,6 @@ public class RequestSellItem implements IClientIncomingPacket
private int _count; private int _count;
private int[] _items; // count*3 private int[] _items; // count*3
/**
* packet type id 0x1e sample 1e 00 00 00 00 // list id 02 00 00 00 // number of items 71 72 00 10 // object id ea 05 00 00 // item id 01 00 00 00 // item count 76 4b 00 10 // object id 2e 0a 00 00 // item id 01 00 00 00 // item count format: cdd (ddd)
*/
@Override @Override
public boolean read(GameClient client, PacketReader packet) public boolean read(GameClient client, PacketReader packet)
{ {
@ -88,18 +85,23 @@ public class RequestSellItem implements IClientIncomingPacket
return; return;
} }
if (_items == null)
{
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
// Alt game - Karma punishment // Alt game - Karma punishment
if (!Config.ALT_GAME_KARMA_PLAYER_CAN_SHOP && (player.getKarma() > 0)) if (!Config.ALT_GAME_KARMA_PLAYER_CAN_SHOP && (player.getKarma() > 0))
{ {
player.sendPacket(ActionFailed.STATIC_PACKET);
return; return;
} }
final WorldObject target = player.getTarget(); final WorldObject target = player.getTarget();
if (!player.isGM() && ((target == null) // No target (ie GM Shop) if (!player.isGM() && (!(target instanceof Merchant) || !player.isInsideRadius2D(target, Npc.INTERACTION_DISTANCE)))
|| !(target instanceof Merchant) // Target not a merchant and not mercmanager
|| !player.isInsideRadius2D(target, Npc.INTERACTION_DISTANCE)))
{ {
return; // Distance is too far return;
} }
String htmlFolder = ""; String htmlFolder = "";
@ -129,18 +131,16 @@ public class RequestSellItem implements IClientIncomingPacket
// Proceed the sell // Proceed the sell
for (int i = 0; i < _count; i++) for (int i = 0; i < _count; i++)
{ {
final int objectId = _items[(i * 3) + 0];
final int count = _items[(i * 3) + 2];
// Check count // Check count
final int count = _items[(i * 3) + 2];
if ((count <= 0) || (count > Integer.MAX_VALUE)) if ((count <= 0) || (count > Integer.MAX_VALUE))
{ {
// Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " tried to purchase over " + Integer.MAX_VALUE + " items at the same time.", Config.DEFAULT_PUNISH);
player.sendPacket(new SystemMessage(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED)); player.sendPacket(new SystemMessage(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED));
return; return;
} }
// Check Item // Check Item
final int objectId = _items[i * 3];
final Item item = player.checkItemManipulation(objectId, count, "sell"); final Item item = player.checkItemManipulation(objectId, count, "sell");
if ((item == null) || !item.getItem().isSellable() || (item.getItemLocation() != ItemLocation.INVENTORY)) if ((item == null) || !item.getItem().isSellable() || (item.getItemLocation() != ItemLocation.INVENTORY))
{ {
@ -153,7 +153,6 @@ public class RequestSellItem implements IClientIncomingPacket
// Fix exploit during Sell // Fix exploit during Sell
if (((Integer.MAX_VALUE / count) < price) || (totalPrice > Integer.MAX_VALUE)) if (((Integer.MAX_VALUE / count) < price) || (totalPrice > Integer.MAX_VALUE))
{ {
// Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " tried to purchase over " + MAX_ADENA + " adena worth of goods.", Config.DEFAULT_PUNISH);
player.sendPacket(new SystemMessage(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED)); player.sendPacket(new SystemMessage(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED));
return; return;
} }
@ -161,7 +160,6 @@ public class RequestSellItem implements IClientIncomingPacket
// Check totalPrice // Check totalPrice
if (totalPrice <= 0) if (totalPrice <= 0)
{ {
// Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " tried to purchase over " + Integer.MAX_VALUE + " adena worth of goods.", Config.DEFAULT_PUNISH);
player.sendPacket(new SystemMessage(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED)); player.sendPacket(new SystemMessage(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED));
return; return;
} }