Merge branch 'development'
This commit is contained in:
commit
aecb614091
|
@ -4,7 +4,7 @@ stages:
|
|||
variables:
|
||||
name: "EpicBosses"
|
||||
path: "/builds/$CI_PROJECT_PATH"
|
||||
version: "1.2.2"
|
||||
version: "1.2.3"
|
||||
|
||||
build:
|
||||
stage: build
|
||||
|
|
|
@ -19,7 +19,7 @@ public class CommandNewAutoSpawn extends AbstractCommand {
|
|||
private AutoSpawnFileManager autoSpawnFileManager;
|
||||
|
||||
public CommandNewAutoSpawn(AutoSpawnFileManager autoSpawnFileManager) {
|
||||
super(false, " ");
|
||||
super(false, "new autospawn");
|
||||
this.autoSpawnFileManager = autoSpawnFileManager;
|
||||
}
|
||||
|
||||
|
|
|
@ -100,12 +100,13 @@ public class ShopPanel extends PanelHandler {
|
|||
}
|
||||
|
||||
|
||||
if (EconomyManager.hasBalance(player, price)) {
|
||||
if (!player.isOp() && !EconomyManager.hasBalance(player, price)) {
|
||||
Message.Boss_Shop_NotEnoughBalance.msg(player, NumberUtils.get().formatDouble(price));
|
||||
return;
|
||||
}
|
||||
|
||||
EconomyManager.withdrawBalance(player, price);
|
||||
if (!player.isOp())
|
||||
EconomyManager.withdrawBalance(player, price);
|
||||
player.getInventory().addItem(spawnItem);
|
||||
Message.Boss_Shop_Purchased.msg(player, spawnItem.getItemMeta().getDisplayName());
|
||||
});
|
||||
|
|
|
@ -24,7 +24,7 @@ public class ItemStackHolderConverter implements IConverter<ItemStackHolder, Con
|
|||
Integer amount = (Integer) configurationSection.get("amount", null);
|
||||
CompatibleMaterial material = CompatibleMaterial.getMaterial(configurationSection.getString("type", null));
|
||||
|
||||
String type = material.getMaterial().name();
|
||||
String type = material.getMaterial() == null ? "STONE" : material.getMaterial().name();
|
||||
|
||||
Short durability = (Short) configurationSection.get("durability", null);
|
||||
if (material.getData() != -1) durability = (short) material.getData();
|
||||
|
|
Loading…
Reference in New Issue