Bug FIxes / Code Simplification
Simplified BetaButton.java - removed redundancy Fixed a bug where CSGI members did not have permission to use /kit
This commit is contained in:
parent
5bfd27bcab
commit
1a46ebdd99
@ -435,7 +435,7 @@ public abstract class Game extends ListenerComponent implements Lifetimed
|
|||||||
_teamModule = new GameTeamModule();
|
_teamModule = new GameTeamModule();
|
||||||
_teamModule.register(this);
|
_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(" "));
|
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!"));
|
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())
|
for (Player other : UtilServer.getPlayers())
|
||||||
{
|
{
|
||||||
|
@ -1,15 +1,11 @@
|
|||||||
package nautilus.game.arcade.gui.privateServer.button;
|
package nautilus.game.arcade.gui.privateServer.button;
|
||||||
|
|
||||||
import mineplex.core.account.permissions.PermissionGroup;
|
|
||||||
import mineplex.core.common.util.C;
|
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.item.IButton;
|
||||||
|
import mineplex.core.shop.page.ShopPageBase;
|
||||||
import nautilus.game.arcade.ArcadeManager;
|
import nautilus.game.arcade.ArcadeManager;
|
||||||
import nautilus.game.arcade.game.games.Beta;
|
import nautilus.game.arcade.game.games.Beta;
|
||||||
import nautilus.game.arcade.gui.privateServer.PrivateServerShop;
|
import nautilus.game.arcade.gui.privateServer.PrivateServerShop;
|
||||||
import nautilus.game.arcade.gui.privateServer.page.GameVotingPage;
|
|
||||||
import org.bukkit.Sound;
|
import org.bukkit.Sound;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import org.bukkit.event.inventory.ClickType;
|
import org.bukkit.event.inventory.ClickType;
|
||||||
@ -18,6 +14,10 @@ public class BetaButton implements IButton {
|
|||||||
|
|
||||||
private ArcadeManager _arcadeManager;
|
private ArcadeManager _arcadeManager;
|
||||||
private PrivateServerShop _shop;
|
private PrivateServerShop _shop;
|
||||||
|
public void playRejection(Player player)
|
||||||
|
{
|
||||||
|
player.playSound(player.getLocation(), Sound.ITEM_BREAK, 1, .6f);
|
||||||
|
}
|
||||||
|
|
||||||
public BetaButton(ArcadeManager arcadeManager, PrivateServerShop shop)
|
public BetaButton(ArcadeManager arcadeManager, PrivateServerShop shop)
|
||||||
{
|
{
|
||||||
@ -25,42 +25,24 @@ public class BetaButton implements IButton {
|
|||||||
_arcadeManager = arcadeManager;
|
_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
|
@Override
|
||||||
public void onClick(Player player, ClickType clickType)
|
public void onClick(Player player, ClickType clickType)
|
||||||
{
|
{
|
||||||
player.closeInventory();
|
player.closeInventory();
|
||||||
if(!_arcadeManager.GetGame().inLobby()){
|
if(!_arcadeManager.GetGame().inLobby()){
|
||||||
rejectedNoise(player);
|
playRejection(player);
|
||||||
player.sendMessage(C.cRedB + "Error: Cannot toggle BETA features in-game...");
|
player.sendMessage(C.cRedB + "Error: Cannot toggle BETA features in-game...");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Beta.enableBeta) {
|
if (Beta.enableBeta) {
|
||||||
Beta.enableBeta = false;
|
Beta.enableBeta = false;
|
||||||
Announce(C.cAquaB + "Disabled BETA Features.", true);
|
_arcadeManager.GetGame().Announce(C.cAquaB + "Disabled BETA Features.", true);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
Beta.enableBeta = true;
|
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);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue
Block a user