Altitude/PlayerShops
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: Altitude:fa8e43eeb0e38bdc74268e35590ac3cb35590a10
Branches Tags
Altitude:main
Altitude:dev/dialog
..
compare: Altitude:9f8bff3ad70aeb1a9f4edba930db924569c12993
Branches Tags
Altitude:dev/dialog
Altitude:main

No commits in common. "fa8e43eeb0e38bdc74268e35590ac3cb35590a10" and "9f8bff3ad70aeb1a9f4edba930db924569c12993" have entirely different histories.
fa8e43eeb0 ... 9f8bff3ad7

3 changed files with 4 additions and 5 deletions
Show Stats Expand all files Collapse all files

1
src/main/java/com/alttd/playershops/gui/GuiIcon.java
View File

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

2
src/main/java/com/alttd/playershops/gui/ListShopsGui.java
View File

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

6
src/main/java/com/alttd/playershops/gui/ShopManagementGui.java
View File

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