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

Disable game boosters in arcade

This commit is contained in:
Shaun Bennett 2016-06-09 00:28:48 -05:00
parent 85829d355d
commit 83be0d7efe
4 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
View File

@ -197,7 +197,6 @@ public class ArcadeManager extends MiniPlugin implements IRelation
private BrandingManager _brandingManager; private BrandingManager _brandingManager;
private BonusManager _bonusManager; private BonusManager _bonusManager;
private BoosterManager _boosterManager; private BoosterManager _boosterManager;
private GameBoosterManager _gameBoosterManager;
private IncognitoManager _incognitoManager; private IncognitoManager _incognitoManager;
@ -300,7 +299,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation
// Shop // Shop
_arcadeShop = new ArcadeShop(this, clientManager, donationManager); _arcadeShop = new ArcadeShop(this, clientManager, donationManager);
_gameBoosterManager = new GameBoosterManager(plugin, boosterManager, disguiseManager, hologramManager, serverConfig); // _gameBoosterManager = new GameBoosterManager(plugin, boosterManager, disguiseManager, hologramManager, serverConfig);
// Managers // Managers
_gameChatManager = new GameChatManager(this); _gameChatManager = new GameChatManager(this);
@ -1290,11 +1289,6 @@ public class ArcadeManager extends MiniPlugin implements IRelation
return _boosterManager; return _boosterManager;
} }
public GameBoosterManager getGameBoosterManager()
{
return _gameBoosterManager;
}
@EventHandler @EventHandler
public void ObserverQuit(GameStateChangeEvent event) public void ObserverQuit(GameStateChangeEvent event)
{ {

5
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/booster/GameBoosterManager.java
View File

@ -13,15 +13,12 @@ import mineplex.core.common.util.UtilPlayer;
import mineplex.core.common.util.UtilWorld; import mineplex.core.common.util.UtilWorld;
import mineplex.core.disguise.DisguiseManager; import mineplex.core.disguise.DisguiseManager;
import mineplex.core.hologram.HologramManager; import mineplex.core.hologram.HologramManager;
import nautilus.game.arcade.events.GameStateChangeEvent;
import nautilus.game.arcade.game.Game;
import nautilus.game.arcade.game.GameServerConfig; import nautilus.game.arcade.game.GameServerConfig;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
import org.omg.PortableServer.IMPLICIT_ACTIVATION_POLICY_ID;
import java.util.List; import java.util.List;
@ -89,6 +86,4 @@ public class GameBoosterManager extends MiniPlugin
{ {
System.out.println("booster deactivate: " + event.getBooster()); System.out.println("booster deactivate: " + event.getBooster());
} }
} }

5
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
View File

@ -1402,11 +1402,6 @@ public abstract class Game implements Listener
SetState(GameState.End); SetState(GameState.End);
} }
public Booster getGemBooster()
{
return Manager.getGameBoosterManager().getActiveBooster();
}
public void AddStat(Player player, String stat, int amount, boolean limitTo1, boolean global) public void AddStat(Player player, String stat, int amount, boolean limitTo1, boolean global)
{ {
if (!Manager.IsRewardStats()) if (!Manager.IsRewardStats())

4
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameGemManager.java
View File

@ -179,8 +179,10 @@ public class GameGemManager implements Listener
} }
//Gem Boooster //Gem Boooster
/*
if (game.GemBoosterEnabled && game.getGemBooster() != null) if (game.GemBoosterEnabled && game.getGemBooster() != null)
total += (int)(earned * game.getGemBooster().getMultiplier()); total += (int)(earned * game.getGemBooster().getMultiplier());
*/
//Gem Finder //Gem Finder
if (game.GemHunterEnabled) if (game.GemHunterEnabled)
@ -292,6 +294,7 @@ public class GameGemManager implements Listener
int totalGems = earnedGems; int totalGems = earnedGems;
//Gem Booster //Gem Booster
/*
Booster gemBooster = game.getGemBooster(); Booster gemBooster = game.getGemBooster();
if (game.GemBoosterEnabled && gemBooster != null) if (game.GemBoosterEnabled && gemBooster != null)
{ {
@ -300,6 +303,7 @@ public class GameGemManager implements Listener
totalGems += earnedGems * gemBooster.getMultiplier(); totalGems += earnedGems * gemBooster.getMultiplier();
} }
*/
//Gem Finder //Gem Finder
if (game.GemHunterEnabled) if (game.GemHunterEnabled)