From 71b7d2008630047507074700b4100fcd4e371b9d Mon Sep 17 00:00:00 2001 From: Brianna Date: Sat, 26 Oct 2019 14:01:11 -0400 Subject: [PATCH 1/4] Suppress errors with incorrect material names. --- .../epicbosses/utils/itemstack/ItemStackHolderConverter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/utils/itemstack/ItemStackHolderConverter.java b/plugin-modules/Core/src/com/songoda/epicbosses/utils/itemstack/ItemStackHolderConverter.java index 314574d..ab8d495 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/utils/itemstack/ItemStackHolderConverter.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/utils/itemstack/ItemStackHolderConverter.java @@ -24,7 +24,7 @@ public class ItemStackHolderConverter implements IConverter Date: Sat, 9 Nov 2019 09:41:11 -0500 Subject: [PATCH 2/4] Added back the auto spawn command. --- .../com/songoda/epicbosses/commands/CommandNewAutoSpawn.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandNewAutoSpawn.java b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandNewAutoSpawn.java index 63a0486..a04aceb 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandNewAutoSpawn.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandNewAutoSpawn.java @@ -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; } From 15f57df5a75dc76170c1a62a1958752f890c164f Mon Sep 17 00:00:00 2001 From: Brianna Date: Sat, 9 Nov 2019 09:43:36 -0500 Subject: [PATCH 3/4] Fixed economy issues. --- .../Core/src/com/songoda/epicbosses/panel/ShopPanel.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/panel/ShopPanel.java b/plugin-modules/Core/src/com/songoda/epicbosses/panel/ShopPanel.java index ff6bdf2..29e8d0f 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/panel/ShopPanel.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/panel/ShopPanel.java @@ -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()); }); From 31bb754444077fa8df7ccdf3af5a2856aa8afa65 Mon Sep 17 00:00:00 2001 From: Brianna Date: Sat, 9 Nov 2019 09:44:15 -0500 Subject: [PATCH 4/4] version 1.2.3 --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3743790..783b985 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,7 @@ stages: variables: name: "EpicBosses" path: "/builds/$CI_PROJECT_PATH" - version: "1.2.2" + version: "1.2.3" build: stage: build