JarvisBigBalls
/
Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Made ItemGadgets Free. 

Removed queue dom shop.
This commit is contained in:
Jonathan Williams 2014-06-10 02:00:53 -05:00
parent 0bf702902e
commit 4fca244812
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Plugins/Mineplex.Hub/src/mineplex/hub/gadget/types/ItemGadget.java
View File

@ -34,6 +34,7 @@ public abstract class ItemGadget extends Gadget
_recharge = recharge; _recharge = recharge;
_gemsPerUse = gemsPerUse; _gemsPerUse = gemsPerUse;
_nearParkour = canUseNearParkour; _nearParkour = canUseNearParkour;
Free = true;
} }
public HashSet<Player> GetActive() public HashSet<Player> GetActive()

2
Plugins/Mineplex.Hub/src/mineplex/hub/gadget/ui/GadgetPage.java
View File

@ -169,7 +169,7 @@ public class GadgetPage extends ShopPageBase<GadgetManager, GadgetShop>
itemLore.add(C.cBlack); itemLore.add(C.cBlack);
itemLore.addAll(Arrays.asList(gadget.GetDescription())); 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)) if (gadget.GetActive().contains(Player))
{ {

6
Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java
View File

@ -105,7 +105,7 @@ public class ServerManager extends MiniPlugin
new ServerManagerUpdater(this); new ServerManagerUpdater(this);
_quickShop = new QuickShop(this, clientManager, donationManager, "Quick Menu"); _quickShop = new QuickShop(this, clientManager, donationManager, "Quick Menu");
_lobbyShop = new LobbyShop(this, clientManager, donationManager, "Lobby 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) @EventHandler(priority = EventPriority.LOW)
@ -182,6 +182,7 @@ public class ServerManager extends MiniPlugin
if (event.getType() != UpdateType.SEC) if (event.getType() != UpdateType.SEC)
return; return;
/*
for (final Player player : _queueManager.findPlayersNeedingPrompt()) for (final Player player : _queueManager.findPlayersNeedingPrompt())
{ {
player.playSound(player.getLocation(), Sound.ENDERDRAGON_GROWL, 5f, 1f); player.playSound(player.getLocation(), Sound.ENDERDRAGON_GROWL, 5f, 1f);
@ -197,6 +198,7 @@ public class ServerManager extends MiniPlugin
} }
}, 20); }, 20);
} }
*/
} }
@EventHandler(priority = EventPriority.LOW) @EventHandler(priority = EventPriority.LOW)
@ -643,7 +645,7 @@ public class ServerManager extends MiniPlugin
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
public ShopBase getDominateShop() public ShopBase getDominateShop()
{ {
return _domShop; return _serverNpcShopMap.get("Dominate");
} }
public ServerNpcShop getBridgesShop() public ServerNpcShop getBridgesShop()