mirror of
https://github.com/ChestShop-authors/ChestShop-3.git
synced 2024-09-27 14:13:05 +02:00
Really fixed Admin Shops now
This commit is contained in:
parent
773ae17118
commit
773df3bbc3
@ -5,6 +5,7 @@ import com.Acrobot.ChestShop.Config.Config;
|
|||||||
import com.Acrobot.ChestShop.Config.Property;
|
import com.Acrobot.ChestShop.Config.Property;
|
||||||
import com.Acrobot.ChestShop.Signs.ChestShopSign;
|
import com.Acrobot.ChestShop.Signs.ChestShopSign;
|
||||||
import com.Acrobot.ChestShop.Utils.uName;
|
import com.Acrobot.ChestShop.Utils.uName;
|
||||||
|
import org.bukkit.inventory.Inventory;
|
||||||
|
|
||||||
import static com.Acrobot.Breeze.Utils.NumberUtil.roundUp;
|
import static com.Acrobot.Breeze.Utils.NumberUtil.roundUp;
|
||||||
|
|
||||||
@ -15,6 +16,10 @@ import static com.Acrobot.Breeze.Utils.NumberUtil.roundUp;
|
|||||||
public class Economy {
|
public class Economy {
|
||||||
private static EcoPlugin economy;
|
private static EcoPlugin economy;
|
||||||
|
|
||||||
|
public static boolean isOwnerEconomicallyActive(Inventory inventory) {
|
||||||
|
return !ChestShopSign.isAdminShop(inventory) || getServerAccountName().isEmpty();
|
||||||
|
}
|
||||||
|
|
||||||
public static boolean hasAccount(String p) {
|
public static boolean hasAccount(String p) {
|
||||||
return !p.isEmpty() && economy.hasAccount(uName.getName(p));
|
return !p.isEmpty() && economy.hasAccount(uName.getName(p));
|
||||||
}
|
}
|
||||||
|
@ -1,13 +1,9 @@
|
|||||||
package com.Acrobot.ChestShop.Listeners.PostTransaction;
|
package com.Acrobot.ChestShop.Listeners.PostTransaction;
|
||||||
|
|
||||||
import com.Acrobot.ChestShop.Config.Config;
|
|
||||||
import com.Acrobot.ChestShop.Config.Property;
|
|
||||||
import com.Acrobot.ChestShop.Containers.AdminInventory;
|
|
||||||
import com.Acrobot.ChestShop.Economy.Economy;
|
import com.Acrobot.ChestShop.Economy.Economy;
|
||||||
import com.Acrobot.ChestShop.Events.TransactionEvent;
|
import com.Acrobot.ChestShop.Events.TransactionEvent;
|
||||||
import org.bukkit.event.EventHandler;
|
import org.bukkit.event.EventHandler;
|
||||||
import org.bukkit.event.Listener;
|
import org.bukkit.event.Listener;
|
||||||
import org.bukkit.inventory.Inventory;
|
|
||||||
|
|
||||||
import static com.Acrobot.ChestShop.Events.TransactionEvent.TransactionType.BUY;
|
import static com.Acrobot.ChestShop.Events.TransactionEvent.TransactionType.BUY;
|
||||||
import static com.Acrobot.ChestShop.Events.TransactionEvent.TransactionType.SELL;
|
import static com.Acrobot.ChestShop.Events.TransactionEvent.TransactionType.SELL;
|
||||||
@ -22,7 +18,7 @@ public class EconomicModule implements Listener {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isOwnerEconomicalyActive(event)) {
|
if (Economy.isOwnerEconomicallyActive(event.getOwnerInventory())) {
|
||||||
Economy.add(event.getOwner().getName(), event.getPrice());
|
Economy.add(event.getOwner().getName(), event.getPrice());
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -35,22 +31,10 @@ public class EconomicModule implements Listener {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isOwnerEconomicalyActive(event)) {
|
if (Economy.isOwnerEconomicallyActive(event.getOwnerInventory())) {
|
||||||
Economy.subtract(event.getOwner().getName(), event.getPrice());
|
Economy.subtract(event.getOwner().getName(), event.getPrice());
|
||||||
}
|
}
|
||||||
|
|
||||||
Economy.add(event.getClient().getName(), event.getPrice());
|
Economy.add(event.getClient().getName(), event.getPrice());
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String getServerAccountName() {
|
|
||||||
return Config.getString(Property.SERVER_ECONOMY_ACCOUNT);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean isServerShop(Inventory inventory) {
|
|
||||||
return inventory instanceof AdminInventory;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean isOwnerEconomicalyActive(TransactionEvent event) {
|
|
||||||
return !isServerShop(event.getOwnerInventory()) || !getServerAccountName().isEmpty();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@ -1,9 +1,6 @@
|
|||||||
package com.Acrobot.ChestShop.Listeners.PreTransaction;
|
package com.Acrobot.ChestShop.Listeners.PreTransaction;
|
||||||
|
|
||||||
import com.Acrobot.Breeze.Utils.InventoryUtil;
|
import com.Acrobot.Breeze.Utils.InventoryUtil;
|
||||||
import com.Acrobot.ChestShop.Config.Config;
|
|
||||||
import com.Acrobot.ChestShop.Config.Property;
|
|
||||||
import com.Acrobot.ChestShop.Containers.AdminInventory;
|
|
||||||
import com.Acrobot.ChestShop.Economy.Economy;
|
import com.Acrobot.ChestShop.Economy.Economy;
|
||||||
import com.Acrobot.ChestShop.Events.PreTransactionEvent;
|
import com.Acrobot.ChestShop.Events.PreTransactionEvent;
|
||||||
import org.bukkit.event.EventHandler;
|
import org.bukkit.event.EventHandler;
|
||||||
@ -47,7 +44,7 @@ public class AmountAndPriceChecker implements Listener {
|
|||||||
ItemStack[] stock = event.getStock();
|
ItemStack[] stock = event.getStock();
|
||||||
Inventory clientInventory = event.getClientInventory();
|
Inventory clientInventory = event.getClientInventory();
|
||||||
|
|
||||||
if (isOwnerEconomicalyActive(event) && !Economy.hasEnough(event.getOwner().getName(), event.getPrice())) {
|
if (Economy.isOwnerEconomicallyActive(event.getOwnerInventory()) && !Economy.hasEnough(event.getOwner().getName(), event.getPrice())) {
|
||||||
event.setCancelled(SHOP_DOES_NOT_HAVE_ENOUGH_MONEY);
|
event.setCancelled(SHOP_DOES_NOT_HAVE_ENOUGH_MONEY);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -57,18 +54,6 @@ public class AmountAndPriceChecker implements Listener {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String getServerAccountName() {
|
|
||||||
return Config.getString(Property.SERVER_ECONOMY_ACCOUNT);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean isServerShop(Inventory inventory) {
|
|
||||||
return inventory instanceof AdminInventory;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean isOwnerEconomicalyActive(PreTransactionEvent event) {
|
|
||||||
return !isServerShop(event.getOwnerInventory()) || !getServerAccountName().isEmpty();
|
|
||||||
}
|
|
||||||
|
|
||||||
private static boolean hasItems(Inventory inventory, ItemStack[] items) {
|
private static boolean hasItems(Inventory inventory, ItemStack[] items) {
|
||||||
for (ItemStack item : items) {
|
for (ItemStack item : items) {
|
||||||
if (InventoryUtil.getAmount(item, inventory) < item.getAmount()) {
|
if (InventoryUtil.getAmount(item, inventory) < item.getAmount()) {
|
||||||
|
@ -77,7 +77,7 @@ public class PartialTransactionModule implements Listener {
|
|||||||
double pricePerItem = event.getPrice() / getItemCount(stock);
|
double pricePerItem = event.getPrice() / getItemCount(stock);
|
||||||
double walletMoney = Economy.getBalance(ownerName);
|
double walletMoney = Economy.getBalance(ownerName);
|
||||||
|
|
||||||
if (!Economy.hasEnough(ownerName, price)) {
|
if (Economy.isOwnerEconomicallyActive(event.getOwnerInventory()) && !Economy.hasEnough(ownerName, price)) {
|
||||||
int amountAffordable = getAmountOfAffordableItems(walletMoney, pricePerItem);
|
int amountAffordable = getAmountOfAffordableItems(walletMoney, pricePerItem);
|
||||||
|
|
||||||
if (amountAffordable < 1) {
|
if (amountAffordable < 1) {
|
||||||
|
@ -2,10 +2,12 @@ package com.Acrobot.ChestShop.Signs;
|
|||||||
|
|
||||||
import com.Acrobot.Breeze.Utils.BlockUtil;
|
import com.Acrobot.Breeze.Utils.BlockUtil;
|
||||||
import com.Acrobot.ChestShop.Config.Config;
|
import com.Acrobot.ChestShop.Config.Config;
|
||||||
|
import com.Acrobot.ChestShop.Containers.AdminInventory;
|
||||||
import com.Acrobot.ChestShop.Utils.uName;
|
import com.Acrobot.ChestShop.Utils.uName;
|
||||||
import org.bukkit.block.Block;
|
import org.bukkit.block.Block;
|
||||||
import org.bukkit.block.Sign;
|
import org.bukkit.block.Sign;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
|
import org.bukkit.inventory.Inventory;
|
||||||
|
|
||||||
import java.util.regex.Pattern;
|
import java.util.regex.Pattern;
|
||||||
|
|
||||||
@ -27,6 +29,10 @@ public class ChestShopSign {
|
|||||||
Pattern.compile("[\\w : -]+")
|
Pattern.compile("[\\w : -]+")
|
||||||
};
|
};
|
||||||
|
|
||||||
|
public static boolean isAdminShop(Inventory ownerInventory) {
|
||||||
|
return ownerInventory instanceof AdminInventory;
|
||||||
|
}
|
||||||
|
|
||||||
public static boolean isAdminShop(String owner) {
|
public static boolean isAdminShop(String owner) {
|
||||||
return owner.replace(" ", "").equalsIgnoreCase(Config.getString(ADMIN_SHOP_NAME).replace(" ", ""));
|
return owner.replace(" ", "").equalsIgnoreCase(Config.getString(ADMIN_SHOP_NAME).replace(" ", ""));
|
||||||
}
|
}
|
||||||
|
@ -2,7 +2,7 @@ name: ChestShop
|
|||||||
|
|
||||||
main: com.Acrobot.ChestShop.ChestShop
|
main: com.Acrobot.ChestShop.ChestShop
|
||||||
|
|
||||||
version: 3.50t0009
|
version: 3.50t0010
|
||||||
|
|
||||||
#for CButD
|
#for CButD
|
||||||
dev-url: http://dev.bukkit.org/server-mods/chestshop/
|
dev-url: http://dev.bukkit.org/server-mods/chestshop/
|
||||||
|
Loading…
Reference in New Issue
Block a user