From eab7aa59f2d64dd8e58fd7260e1eb431029732db Mon Sep 17 00:00:00 2001 From: Mini-Chiss Date: Sat, 8 Aug 2015 09:27:49 +0200 Subject: [PATCH] hub update! --- .../mineplex/core/gadget/gadgets/OutfitTeam.java | 4 ++++ .../src/mineplex/hub/modules/SoccerManager.java | 16 ++++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/OutfitTeam.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/OutfitTeam.java index ee053c618..34fd99802 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/OutfitTeam.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/OutfitTeam.java @@ -23,6 +23,7 @@ import mineplex.core.gadget.event.GadgetActivateEvent; import mineplex.core.gadget.types.OutfitGadget; import mineplex.core.gadget.types.OutfitGadget.ArmorSlot; import mineplex.core.itemstack.ItemStackFactory; +import mineplex.core.recharge.Recharge; public class OutfitTeam extends OutfitGadget { @@ -98,6 +99,9 @@ public class OutfitTeam extends OutfitGadget if (args.length < 2) return; + + if (!Recharge.Instance.use(player, "Set Team Color", 20000, true, false)) + return; //Color if (args[1].equals("red")) diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/SoccerManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/SoccerManager.java index 55fe110cf..db273a153 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/SoccerManager.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/SoccerManager.java @@ -90,19 +90,19 @@ public class SoccerManager extends MiniPlugin Manager = manager; _cornerFieldPlayerA = new Location(Manager.GetSpawn().getWorld(), 28.5,70,-27.5); - _cornerFieldPlayerB = new Location(Manager.GetSpawn().getWorld(), 49.5,100,-63.5); + _cornerFieldPlayerB = new Location(Manager.GetSpawn().getWorld(), 50.5,100,-65.5); _cornerGoalPlayerA = new Location(Manager.GetSpawn().getWorld(), 35.5,70,-24.5); - _cornerGoalPlayerB = new Location(Manager.GetSpawn().getWorld(), 42.5,100,-66.5); + _cornerGoalPlayerB = new Location(Manager.GetSpawn().getWorld(), 43.5,100,-68.5); _cornerFieldA = new Location(Manager.GetSpawn().getWorld(), 29.75,70,-28.75); - _cornerFieldB = new Location(Manager.GetSpawn().getWorld(), 48.25,100,-62.25); + _cornerFieldB = new Location(Manager.GetSpawn().getWorld(), 49.25,100,-64.25); - _cornerRedGoalA = new Location(Manager.GetSpawn().getWorld(), 36.75,70,-62.25); - _cornerRedGoalB = new Location(Manager.GetSpawn().getWorld(), 41.25,73.5,-65.25); + _cornerRedGoalA = new Location(Manager.GetSpawn().getWorld(), 36.75,70,-64.25); + _cornerRedGoalB = new Location(Manager.GetSpawn().getWorld(), 42.25,73.5,-67.25); _cornerBlueGoalA = new Location(Manager.GetSpawn().getWorld(), 36.75,70,-25.75); - _cornerBlueGoalB = new Location(Manager.GetSpawn().getWorld(), 41.25,73.5,-28.75); + _cornerBlueGoalB = new Location(Manager.GetSpawn().getWorld(), 42.25,73.5,-28.75); //Store Gadgets for (Gadget gadget : gadgets.getGadgets(GadgetType.Costume)) @@ -337,10 +337,10 @@ public class SoccerManager extends MiniPlugin @EventHandler public void clean(UpdateEvent event) { - if (event.getType() != UpdateType.FAST) + if (event.getType() != UpdateType.FASTER) return; - for (Entity ent : _cornerFieldA.getWorld().getEntitiesByClass(LivingEntity.class)) + for (Entity ent : _cornerFieldA.getWorld().getEntities()) { if (ent instanceof Player) continue;