Merge remote-tracking branch 'upstream/master' into bot

This commit is contained in:
RedSparr0w
2019-11-22 20:48:03 +13:00
33 changed files with 55 additions and 51 deletions
@@ -266,7 +266,7 @@ public class Trading {
return false;
}
if (amount >= 1000000000) {
if (amount >= Integer.MAX_VALUE) {
player.getActionSender().sendMessage("You can't possibly have that much of that item!");
player.getItemAssistant().deleteItem(itemID, fromSlot, amount);
return false;
@@ -279,14 +279,6 @@ public class Trading {
return false;
}
}
if (!RareProtection.doOtherDupe(player, itemID)) {
return false;
}
// /if (!((c.playerItems[fromSlot] == itemID + 1) &&
// (c.playerItemsN[fromSlot] >= amount))) {
// c.getPacketDispatcher().sendMessage("You don't have that amount!");
// return false;
// }
player.tradeConfirmed = false;
o.tradeConfirmed = false;
if (!Item.itemStackable[itemID] && !Item.itemIsNote[itemID]) {