From 685d94d7e4695fe0dc8698aa62dfb8e239fa6afc Mon Sep 17 00:00:00 2001 From: Brianna Date: Tue, 15 Oct 2019 14:07:55 -0400 Subject: [PATCH 1/3] Fixed issue with removing holograms. --- src/main/java/com/songoda/epicanchors/EpicAnchors.java | 1 - src/main/java/com/songoda/epicanchors/anchor/Anchor.java | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/com/songoda/epicanchors/EpicAnchors.java b/src/main/java/com/songoda/epicanchors/EpicAnchors.java index 5b60ba9..2c483ac 100644 --- a/src/main/java/com/songoda/epicanchors/EpicAnchors.java +++ b/src/main/java/com/songoda/epicanchors/EpicAnchors.java @@ -20,7 +20,6 @@ import com.songoda.epicanchors.utils.Methods; import org.apache.commons.lang.math.NumberUtils; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.Material; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.plugin.PluginManager; diff --git a/src/main/java/com/songoda/epicanchors/anchor/Anchor.java b/src/main/java/com/songoda/epicanchors/anchor/Anchor.java index e2d726f..98814a3 100644 --- a/src/main/java/com/songoda/epicanchors/anchor/Anchor.java +++ b/src/main/java/com/songoda/epicanchors/anchor/Anchor.java @@ -61,6 +61,7 @@ public class Anchor { ItemStack item = plugin.makeAnchorItem(getTicksLeft()); getLocation().getWorld().dropItemNaturally(getLocation(), item); } + plugin.clearHologram(this); location.getBlock().setType(Material.AIR); if (ServerVersion.isServerVersionAtLeast(ServerVersion.V1_9)) @@ -70,7 +71,6 @@ public class Anchor { ? Sound.ENTITY_GENERIC_EXPLODE : Sound.valueOf("EXPLODE"), 10, 10); plugin.getAnchorManager().removeAnchor(location); - plugin.clearHologram(this); } public Location getLocation() { From 4b21d99b6c34ee1baaf3248aaf758ce8e3a467f2 Mon Sep 17 00:00:00 2001 From: Brianna Date: Tue, 15 Oct 2019 14:11:28 -0400 Subject: [PATCH 2/3] Optimized gui to match the rest of the Epic lineup. --- src/main/java/com/songoda/epicanchors/gui/GUIOverview.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/songoda/epicanchors/gui/GUIOverview.java b/src/main/java/com/songoda/epicanchors/gui/GUIOverview.java index db3293e..c05c4bd 100644 --- a/src/main/java/com/songoda/epicanchors/gui/GUIOverview.java +++ b/src/main/java/com/songoda/epicanchors/gui/GUIOverview.java @@ -52,7 +52,7 @@ public class GUIOverview extends Gui { ChatColor.GRAY + Methods.makeReadable((long) (anchor.getTicksLeft() / 20) * 1000) + " remaining.")); if (EconomyManager.isEnabled() && Settings.ADD_TIME_WITH_ECONOMY.getBoolean()) { - setButton(11, GuiUtils.createButtonItem(Settings.ECO_ICON.getMaterial(CompatibleMaterial.SUNFLOWER), + setButton(15, GuiUtils.createButtonItem(Settings.ECO_ICON.getMaterial(CompatibleMaterial.SUNFLOWER), plugin.getLocale().getMessage("interface.button.addtimewitheconomy").getMessage(), plugin.getLocale().getMessage("interface.button.addtimewitheconomylore") .processPlaceholder("cost", Methods.formatEconomy(Settings.ECONOMY_COST.getDouble())).getMessage()), // EconomyManager.formatEconomy adds its own prefix/suffix @@ -60,7 +60,7 @@ public class GUIOverview extends Gui { } if (Settings.ADD_TIME_WITH_XP.getBoolean()) { - setButton(15, GuiUtils.createButtonItem(Settings.XP_ICON.getMaterial(CompatibleMaterial.EXPERIENCE_BOTTLE), + setButton(11, GuiUtils.createButtonItem(Settings.XP_ICON.getMaterial(CompatibleMaterial.EXPERIENCE_BOTTLE), plugin.getLocale().getMessage("interface.button.addtimewithxp").getMessage(), plugin.getLocale().getMessage("interface.button.addtimewithxplore") .processPlaceholder("cost", String.valueOf(Settings.XP_COST.getInt())).getMessage()), From 23fbd647347e2beb2c558c20a2ca2b32f675e345 Mon Sep 17 00:00:00 2001 From: Brianna Date: Tue, 15 Oct 2019 14:28:17 -0400 Subject: [PATCH 3/3] version 1.4.5 --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 61a3a19..4c0582a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,7 @@ stages: variables: name: "EpicAnchors" path: "/builds/$CI_PROJECT_PATH" - version: "1.4.4" + version: "1.4.5" build: stage: build