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
@@ -368,6 +368,7 @@ public class ShopAssistant {
}
if (player.TotalShopItems >= 39) {
player.getActionSender().sendMessage("If you sell more individuals items in this shop, they won't be displayed.");
return false;
}
if (amount > 0 && itemID == (player.playerItems[fromSlot] - 1)) {