From 4fca244812b7cff9d7c4fd4d1e66ba2ff360cf4b Mon Sep 17 00:00:00 2001 From: Jonathan Williams Date: Tue, 10 Jun 2014 02:00:53 -0500 Subject: [PATCH] Made ItemGadgets Free. Removed queue dom shop. --- .../src/mineplex/hub/gadget/types/ItemGadget.java | 1 + .../Mineplex.Hub/src/mineplex/hub/gadget/ui/GadgetPage.java | 2 +- .../Mineplex.Hub/src/mineplex/hub/server/ServerManager.java | 6 ++++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/gadget/types/ItemGadget.java b/Plugins/Mineplex.Hub/src/mineplex/hub/gadget/types/ItemGadget.java index 18b8625b2..6ee3cb925 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/gadget/types/ItemGadget.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/gadget/types/ItemGadget.java @@ -34,6 +34,7 @@ public abstract class ItemGadget extends Gadget _recharge = recharge; _gemsPerUse = gemsPerUse; _nearParkour = canUseNearParkour; + Free = true; } public HashSet GetActive() diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/gadget/ui/GadgetPage.java b/Plugins/Mineplex.Hub/src/mineplex/hub/gadget/ui/GadgetPage.java index 3c19a848d..cb46e8528 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/gadget/ui/GadgetPage.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/gadget/ui/GadgetPage.java @@ -169,7 +169,7 @@ public class GadgetPage extends ShopPageBase itemLore.add(C.cBlack); itemLore.addAll(Arrays.asList(gadget.GetDescription())); - if (gadget.GetCost(CurrencyType.Gems) == -1 || DonationManager.Get(Player.getName()).OwnsUnknownPackage(gadget.GetName())) + if (gadget.IsFree() || DonationManager.Get(Player.getName()).OwnsUnknownPackage(gadget.GetName())) { if (gadget.GetActive().contains(Player)) { diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java index 04dacadfc..c0fcc0af2 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java @@ -105,7 +105,7 @@ public class ServerManager extends MiniPlugin new ServerManagerUpdater(this); _quickShop = new QuickShop(this, clientManager, donationManager, "Quick Menu"); _lobbyShop = new LobbyShop(this, clientManager, donationManager, "Lobby Menu"); - _domShop = new QueueShop(_queueManager, clientManager, donationManager, "Dominate"); + //_domShop = new new QueueShop(_queueManager, clientManager, donationManager, "Dominate"); } @EventHandler(priority = EventPriority.LOW) @@ -182,6 +182,7 @@ public class ServerManager extends MiniPlugin if (event.getType() != UpdateType.SEC) return; + /* for (final Player player : _queueManager.findPlayersNeedingPrompt()) { player.playSound(player.getLocation(), Sound.ENDERDRAGON_GROWL, 5f, 1f); @@ -197,6 +198,7 @@ public class ServerManager extends MiniPlugin } }, 20); } + */ } @EventHandler(priority = EventPriority.LOW) @@ -643,7 +645,7 @@ public class ServerManager extends MiniPlugin @SuppressWarnings("rawtypes") public ShopBase getDominateShop() { - return _domShop; + return _serverNpcShopMap.get("Dominate"); } public ServerNpcShop getBridgesShop()