diff --git a/Plugins/Mineplex.Core/src/mineplex/core/treasure/gui/TreasurePage.java b/Plugins/Mineplex.Core/src/mineplex/core/treasure/gui/TreasurePage.java index 12e3a69f9..9f15e54cc 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/treasure/gui/TreasurePage.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/treasure/gui/TreasurePage.java @@ -1,5 +1,6 @@ package mineplex.core.treasure.gui; +import java.io.File; import java.util.ArrayList; import java.util.List; @@ -136,13 +137,6 @@ public class TreasurePage extends ShopPageBase int gingerbreadCount = _inventoryManager.Get(getPlayer()).getItemCount(TreasureType.GINGERBREAD.getItemName()); int minestrikeCount = _inventoryManager.Get(getPlayer()).getItemCount(TreasureType.MINESTRIKE.getItemName()); - boolean availableChristmas = false; - boolean availableFreedom = false; - boolean availableHaunted = false; - boolean availableTrick = false; - boolean availableThank = false; - boolean availableGingerbread = false; - List shardLore = new ArrayList<>(); shardLore.add(" "); shardLore.add(C.cGray + "This seems like it might come in"); @@ -302,7 +296,8 @@ public class TreasurePage extends ShopPageBase } else { - if (!availableTrick) + boolean available = new File("../../update/files/EnableTrickOrTreat.dat").exists(); + if (!available) { trickLore.add(C.cRed + "This item is no longer available!"); } @@ -328,7 +323,8 @@ public class TreasurePage extends ShopPageBase } else { - if (!availableThank) + boolean available = new File("../../update/files/EnableThankful.dat").exists(); + if (!available) { thankLore.add(C.cRed + "This item is no longer available!"); } @@ -426,37 +422,12 @@ public class TreasurePage extends ShopPageBase _normalTreasures.add(omegaTreasureItem); _normalTreasures.add(minestrikeTreasureItem); - - - if (availableChristmas) - _specialTreasures.add(winterTreasureItem); - else - _seasonalTreasures.add(winterTreasureItem); - - if (availableFreedom) - _specialTreasures.add(freedomTreasureItem); - else - _seasonalTreasures.add(freedomTreasureItem); - - if (availableHaunted) - _specialTreasures.add(hauntedTreasureItem); - else - _seasonalTreasures.add(hauntedTreasureItem); - - if (availableTrick) - _specialTreasures.add(trickTreasureItem); - else - _seasonalTreasures.add(trickTreasureItem); - - if (availableThank) - _specialTreasures.add(thankTreasureItem); - else - _seasonalTreasures.add(thankTreasureItem); - - if (availableGingerbread) - _specialTreasures.add(gingerbreadTreasureItem); - else - _seasonalTreasures.add(gingerbreadTreasureItem); + _seasonalTreasures.add(winterTreasureItem); + _seasonalTreasures.add(freedomTreasureItem); + _seasonalTreasures.add(hauntedTreasureItem); + _seasonalTreasures.add(trickTreasureItem); + _seasonalTreasures.add(thankTreasureItem); + _seasonalTreasures.add(gingerbreadTreasureItem); } private void buildFirstPage()