diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java index 9465e49ba..696e8da92 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java @@ -197,7 +197,6 @@ public class ArcadeManager extends MiniPlugin implements IRelation private BrandingManager _brandingManager; private BonusManager _bonusManager; private BoosterManager _boosterManager; - private GameBoosterManager _gameBoosterManager; private IncognitoManager _incognitoManager; @@ -300,7 +299,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation // Shop _arcadeShop = new ArcadeShop(this, clientManager, donationManager); - _gameBoosterManager = new GameBoosterManager(plugin, boosterManager, disguiseManager, hologramManager, serverConfig); +// _gameBoosterManager = new GameBoosterManager(plugin, boosterManager, disguiseManager, hologramManager, serverConfig); // Managers _gameChatManager = new GameChatManager(this); @@ -1290,11 +1289,6 @@ public class ArcadeManager extends MiniPlugin implements IRelation return _boosterManager; } - public GameBoosterManager getGameBoosterManager() - { - return _gameBoosterManager; - } - @EventHandler public void ObserverQuit(GameStateChangeEvent event) { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/booster/GameBoosterManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/booster/GameBoosterManager.java index 17a715eb3..55c9c67aa 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/booster/GameBoosterManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/booster/GameBoosterManager.java @@ -13,15 +13,12 @@ import mineplex.core.common.util.UtilPlayer; import mineplex.core.common.util.UtilWorld; import mineplex.core.disguise.DisguiseManager; import mineplex.core.hologram.HologramManager; -import nautilus.game.arcade.events.GameStateChangeEvent; -import nautilus.game.arcade.game.Game; import nautilus.game.arcade.game.GameServerConfig; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.plugin.java.JavaPlugin; -import org.omg.PortableServer.IMPLICIT_ACTIVATION_POLICY_ID; import java.util.List; @@ -89,6 +86,4 @@ public class GameBoosterManager extends MiniPlugin { System.out.println("booster deactivate: " + event.getBooster()); } - - } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java index eb4e5f0cc..3ee570d65 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java @@ -1402,11 +1402,6 @@ public abstract class Game implements Listener SetState(GameState.End); } - public Booster getGemBooster() - { - return Manager.getGameBoosterManager().getActiveBooster(); - } - public void AddStat(Player player, String stat, int amount, boolean limitTo1, boolean global) { if (!Manager.IsRewardStats()) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameGemManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameGemManager.java index c0d013792..3bf200a83 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameGemManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameGemManager.java @@ -179,8 +179,10 @@ public class GameGemManager implements Listener } //Gem Boooster + /* if (game.GemBoosterEnabled && game.getGemBooster() != null) total += (int)(earned * game.getGemBooster().getMultiplier()); + */ //Gem Finder if (game.GemHunterEnabled) @@ -292,6 +294,7 @@ public class GameGemManager implements Listener int totalGems = earnedGems; //Gem Booster + /* Booster gemBooster = game.getGemBooster(); if (game.GemBoosterEnabled && gemBooster != null) { @@ -300,6 +303,7 @@ public class GameGemManager implements Listener totalGems += earnedGems * gemBooster.getMultiplier(); } + */ //Gem Finder if (game.GemHunterEnabled)