Compare commits

...

2 Commits

Author SHA1 Message Date
Len fa8e43eeb0 Add Collect sales from a single shop 2024-09-15 18:50:01 +02:00
Len 8086d49ae9 Fix Random shops not being included in the Collect sales function. 2024-09-15 18:49:34 +02:00
3 changed files with 5 additions and 4 deletions

View File

@ -30,6 +30,7 @@ public enum GuiIcon {
MANAGE_SHOP_AMOUNT,
MANAGE_SHOP_PRICE,
MANAGE_SHOP_COLLECT_SALES,
MANAGE_SHOP_COLLECT_SALE,
HOME_LIST_OWN_SHOPS,
HOME_LIST_PLAYERS,

View File

@ -80,7 +80,7 @@ public class ListShopsGui extends AbstractGui {
for (PlayerShop playerShop : shops) {
if (!ShopUtil.canManageShop(player, playerShop))
continue;
if (!playerShop.getType().equals(ShopType.SELL))
if (playerShop.getType().equals(ShopType.BUY))
continue;
double balance = playerShop.getBalance();

View File

@ -60,7 +60,7 @@ public class ShopManagementGui extends AbstractGui {
inventory.setItem(GuiIcon.MANAGE_SHOP.getSlot(), shopIcon);
inventory.setItem(GuiIcon.MANAGE_SHOP_BALANCE_ADD.getSlot(), GuiIcon.MANAGE_SHOP_BALANCE_ADD.getItemStack());
inventory.setItem(GuiIcon.MANAGE_SHOP_BALANCE_REMOVE.getSlot(), GuiIcon.MANAGE_SHOP_BALANCE_REMOVE.getItemStack());
inventory.setItem(GuiIcon.MANAGE_SHOP_COLLECT_SALES.getSlot(), GuiIcon.MANAGE_SHOP_COLLECT_SALES.getItemStack());
inventory.setItem(GuiIcon.MANAGE_SHOP_COLLECT_SALE.getSlot(), GuiIcon.MANAGE_SHOP_COLLECT_SALE.getItemStack());
inventory.setItem(GuiIcon.MANAGE_SHOP_SALES.getSlot(), GuiIcon.MANAGE_SHOP_SALES.getItemStack());
inventory.setItem(GuiIcon.MANAGE_SHOP_ITEM.getSlot(), GuiIcon.MANAGE_SHOP_ITEM.getItemStack());
inventory.setItem(GuiIcon.MANAGE_SHOP_TYPE.getSlot(), GuiIcon.MANAGE_SHOP_TYPE.getItemStack());
@ -77,13 +77,13 @@ public class ShopManagementGui extends AbstractGui {
public void onClick(int slot, ItemStack item) {
super.onClick(slot, item);
if (slot == GuiIcon.MANAGE_SHOP_COLLECT_SALES.getSlot() && GuiIcon.MANAGE_SHOP_COLLECT_SALES.getItemStack().equals(item)) {
if (slot == GuiIcon.MANAGE_SHOP_COLLECT_SALE.getSlot() && GuiIcon.MANAGE_SHOP_COLLECT_SALE.getItemStack().equals(item)) {
Player player = getPlayer();
double d = 0;
int count = 0;
if (!ShopUtil.canManageShop(player, this.shop))
return;
if (!this.shop.getType().equals(ShopType.SELL))
if (this.shop.getType().equals(ShopType.BUY))
return;
double balance = this.shop.getBalance();