Upstream
/
EpicBosses
mirror of https://github.com/songoda/EpicBosses.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'development'

This commit is contained in:
Brianna 2019-11-09 09:44:19 -05:00
parent 25c2809252 31bb754444
commit aecb614091
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -4,7 +4,7 @@ stages:
variables: variables:
name: "EpicBosses" name: "EpicBosses"
path: "/builds/$CI_PROJECT_PATH" path: "/builds/$CI_PROJECT_PATH"
version: "1.2.2" version: "1.2.3"
build: build:
stage: build stage: build

2
plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandNewAutoSpawn.java
View File

@ -19,7 +19,7 @@ public class CommandNewAutoSpawn extends AbstractCommand {
private AutoSpawnFileManager autoSpawnFileManager; private AutoSpawnFileManager autoSpawnFileManager;
public CommandNewAutoSpawn(AutoSpawnFileManager autoSpawnFileManager) { public CommandNewAutoSpawn(AutoSpawnFileManager autoSpawnFileManager) {
super(false, " "); super(false, "new autospawn");
this.autoSpawnFileManager = autoSpawnFileManager; this.autoSpawnFileManager = autoSpawnFileManager;
} }

5
plugin-modules/Core/src/com/songoda/epicbosses/panel/ShopPanel.java
View File

@ -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)); Message.Boss_Shop_NotEnoughBalance.msg(player, NumberUtils.get().formatDouble(price));
return; return;
} }
EconomyManager.withdrawBalance(player, price); if (!player.isOp())
EconomyManager.withdrawBalance(player, price);
player.getInventory().addItem(spawnItem); player.getInventory().addItem(spawnItem);
Message.Boss_Shop_Purchased.msg(player, spawnItem.getItemMeta().getDisplayName()); Message.Boss_Shop_Purchased.msg(player, spawnItem.getItemMeta().getDisplayName());
}); });

2
plugin-modules/Core/src/com/songoda/epicbosses/utils/itemstack/ItemStackHolderConverter.java
View File

@ -24,7 +24,7 @@ public class ItemStackHolderConverter implements IConverter<ItemStackHolder, Con
Integer amount = (Integer) configurationSection.get("amount", null); Integer amount = (Integer) configurationSection.get("amount", null);
CompatibleMaterial material = CompatibleMaterial.getMaterial(configurationSection.getString("type", 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); Short durability = (Short) configurationSection.get("durability", null);
if (material.getData() != -1) durability = (short) material.getData(); if (material.getData() != -1) durability = (short) material.getData();