diff --git a/Plugins/Mineplex.Core/src/mineplex/core/recharge/Recharge.java b/Plugins/Mineplex.Core/src/mineplex/core/recharge/Recharge.java index 100b63432..c5f4633de 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/recharge/Recharge.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/recharge/Recharge.java @@ -1,6 +1,7 @@ package mineplex.core.recharge; import java.util.HashSet; +import java.util.Iterator; import java.util.LinkedList; import org.bukkit.entity.Player; @@ -218,6 +219,26 @@ public class Recharge extends MiniPlugin { _recharge.put(player.getName(), new NautHashMap()); } + + public void Reset(Player player, String stringContains) + { + NautHashMap data = _recharge.get(player.getName()); + + if (data == null) + return; + + Iterator rechargeIter = data.keySet().iterator(); + + while (rechargeIter.hasNext()) + { + String key = rechargeIter.next(); + + if (key.toLowerCase().contains(stringContains.toLowerCase())) + { + rechargeIter.remove(); + } + } + } public void debug(Player player, String ability) { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java index 45ec44424..010eaf74c 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java @@ -1927,14 +1927,7 @@ public class MineStrike extends TeamGame { player.playSound(player.getLocation(), Sound.LEVEL_UP, 1f, 1f); - //Clear reloading things - for (String recharge : Recharge.Instance.Get(player).keySet()) - { - if (!recharge.toLowerCase().contains("reload")) - continue; - - Recharge.Instance.recharge(player, recharge); - } + Recharge.Instance.Reset(player, "reload"); } UtilTextMiddle.display(null, winnerLine, 20, 120, 20);