From c520bd792136b5773dcbc610073a4c338d6e7858 Mon Sep 17 00:00:00 2001 From: Shaun Bennett Date: Fri, 14 Aug 2015 20:43:58 -0500 Subject: [PATCH] Add recharge to carl spins so that they don't get triggered twice --- .../src/mineplex/core/account/command/UpdateRank.java | 1 - .../Mineplex.Core/src/mineplex/core/bonuses/BonusManager.java | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/account/command/UpdateRank.java b/Plugins/Mineplex.Core/src/mineplex/core/account/command/UpdateRank.java index 529148615..dae3f6f4e 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/account/command/UpdateRank.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/account/command/UpdateRank.java @@ -60,7 +60,6 @@ public class UpdateRank extends CommandBase final Rank rank = tempRank; - if (rank == Rank.ADMIN || rank == Rank.YOUTUBE || rank == Rank.TWITCH || rank == Rank.MODERATOR || rank == Rank.JNR_DEV || rank == Rank.HELPER || rank == Rank.ALL || rank == Rank.MAPDEV || rank == Rank.SNR_MODERATOR) if (rank == Rank.ADMIN || rank == Rank.YOUTUBE || rank == Rank.TWITCH || rank == Rank.MODERATOR || rank == Rank.JNR_DEV || rank == Rank.HELPER || rank == Rank.ALL || rank == Rank.MAPDEV || rank == Rank.SNR_MODERATOR) { if (!testServer && rank.Has(Rank.ADMIN) && !Plugin.hasRank(caller, Rank.LT)) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusManager.java b/Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusManager.java index 0e0b52abf..747bc2307 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusManager.java @@ -482,7 +482,7 @@ public class BonusManager extends MiniClientPlugin implements I { final BonusClientData clientData = Get(player); - if (clientData.getTickets() > 0) + if (Recharge.Instance.use(player, "Carl Spin", 5000, false, false) && clientData.getTickets() > 0) { CarlSpinnerEvent event = new CarlSpinnerEvent(player); Bukkit.getServer().getPluginManager().callEvent(event);