diff --git a/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java b/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java index b2ce6f4b..6d9ba9c1 100644 --- a/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java +++ b/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java @@ -435,7 +435,7 @@ public abstract class Game extends ListenerComponent implements Lifetimed _teamModule = new GameTeamModule(); _teamModule.register(this); - registerDebugCommand("kit", Perm.DEBUG_COMMANDS, PermissionGroup.ADMIN, (caller, args) -> + registerDebugCommand("kit", Perm.DEBUG_COMMANDS, PermissionGroup.MOD, (caller, args) -> { String kit = Arrays.stream(args).collect(Collectors.joining(" ")); @@ -450,7 +450,7 @@ public abstract class Game extends ListenerComponent implements Lifetimed caller.sendMessage(F.main("Kit", "Sorry, but that is not a kit!")); }); - registerDebugCommand("cooldown", Perm.DEBUG_COMMANDS, PermissionGroup.ADMIN, (caller, args) -> + registerDebugCommand("cooldown", Perm.DEBUG_COMMANDS, PermissionGroup.MOD, (caller, args) -> { for (Player other : UtilServer.getPlayers()) { diff --git a/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/button/BetaButton.java b/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/button/BetaButton.java index f74c5770..1be5dc41 100644 --- a/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/button/BetaButton.java +++ b/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/button/BetaButton.java @@ -1,15 +1,11 @@ package nautilus.game.arcade.gui.privateServer.button; -import mineplex.core.account.permissions.PermissionGroup; import mineplex.core.common.util.C; -import mineplex.core.common.util.F; -import mineplex.core.common.util.UtilPlayer; -import mineplex.core.common.util.UtilServer; import mineplex.core.shop.item.IButton; +import mineplex.core.shop.page.ShopPageBase; import nautilus.game.arcade.ArcadeManager; import nautilus.game.arcade.game.games.Beta; import nautilus.game.arcade.gui.privateServer.PrivateServerShop; -import nautilus.game.arcade.gui.privateServer.page.GameVotingPage; import org.bukkit.Sound; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; @@ -18,6 +14,10 @@ public class BetaButton implements IButton { private ArcadeManager _arcadeManager; private PrivateServerShop _shop; + public void playRejection(Player player) + { + player.playSound(player.getLocation(), Sound.ITEM_BREAK, 1, .6f); + } public BetaButton(ArcadeManager arcadeManager, PrivateServerShop shop) { @@ -25,42 +25,24 @@ public class BetaButton implements IButton { _arcadeManager = arcadeManager; } - public void rejectedNoise(Player player) - { - player.playSound(player.getLocation(), Sound.ITEM_BREAK, 1, .6f); - } - - public void Announce(String message, boolean playSound) - { - for (Player player : UtilServer.getPlayers()) - { - if (playSound) - player.playSound(player.getLocation(), Sound.NOTE_PLING, 1f, 1f); - - UtilPlayer.message(player, message); - } - - System.out.println("[Announcement] " + message); - } - @Override public void onClick(Player player, ClickType clickType) { player.closeInventory(); if(!_arcadeManager.GetGame().inLobby()){ - rejectedNoise(player); + playRejection(player); player.sendMessage(C.cRedB + "Error: Cannot toggle BETA features in-game..."); return; } if (Beta.enableBeta) { Beta.enableBeta = false; - Announce(C.cAquaB + "Disabled BETA Features.", true); + _arcadeManager.GetGame().Announce(C.cAquaB + "Disabled BETA Features.", true); return; } - + Beta.enableBeta = true; - Announce(C.cAquaB + "Enabled BETA Features. Caution: Highly Experimental!", true); + _arcadeManager.GetGame().Announce(C.cAquaB + "Enabled BETA Features. Caution: Highly Experimental!", true); } } diff --git a/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/Game.class b/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/Game.class index 3556bc91..3d5fe223 100644 Binary files a/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/Game.class and b/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/Game.class differ diff --git a/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/gui/privateServer/button/BetaButton.class b/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/gui/privateServer/button/BetaButton.class index 80a46768..695ce8f5 100644 Binary files a/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/gui/privateServer/button/BetaButton.class and b/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/gui/privateServer/button/BetaButton.class differ diff --git a/out/artifacts/nautilus_game_arcade_jar/nautilus-game-arcade.jar b/out/artifacts/nautilus_game_arcade_jar/nautilus-game-arcade.jar index f893d16d..d8594453 100644 Binary files a/out/artifacts/nautilus_game_arcade_jar/nautilus-game-arcade.jar and b/out/artifacts/nautilus_game_arcade_jar/nautilus-game-arcade.jar differ