From 817b8b03f64e828b2c585da8d68a1ffb14505a87 Mon Sep 17 00:00:00 2001 From: William Burns Date: Mon, 3 Aug 2015 13:40:13 +0100 Subject: [PATCH] Whitelist fixes etc. --- .../arcade/game/games/event/EventModule.java | 6 ++-- .../privateServer/button/WhitelistButton.java | 10 ++++++- .../gui/privateServer/page/PlayerPage.java | 30 ++++++++++++++++++- .../privateServer/page/WhitelistedPage.java | 6 ++-- 4 files changed, 45 insertions(+), 7 deletions(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/event/EventModule.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/event/EventModule.java index c651d6ea1..6b77dd967 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/event/EventModule.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/event/EventModule.java @@ -79,11 +79,11 @@ public class EventModule extends MiniPlugin @EventHandler public void setHostDebug(PlayerCommandPreprocessEvent event) { - if (!Manager.GetClients().Get(event.getPlayer()).GetRank().Has(event.getPlayer(), Rank.JNR_DEV, true)) - return; - if (!event.getMessage().toLowerCase().startsWith("/sethost ")) return; + + if (!Manager.GetClients().Get(event.getPlayer()).GetRank().Has(event.getPlayer(), Rank.JNR_DEV, true)) + return; Manager.GetServerConfig().HostName = event.getMessage().split(" ")[1]; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/button/WhitelistButton.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/button/WhitelistButton.java index 768b4013f..5da1d273d 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/button/WhitelistButton.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/button/WhitelistButton.java @@ -1,5 +1,8 @@ package nautilus.game.arcade.gui.privateServer.button; +import java.util.ArrayList; +import java.util.List; + import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; @@ -29,6 +32,11 @@ public class WhitelistButton implements IButton @Override public void onClick(Player player, ClickType clickType) { - _shop.openPageForPlayer(player, new WhitelistedPage(_arcadeManager, _shop, player)); + List strings = new ArrayList<>(); + for (String s : _arcadeManager.GetGameHostManager().getWhitelist()) + { + strings.add(s); + } + _shop.openPageForPlayer(player, new WhitelistedPage(_arcadeManager, _shop, player, strings)); } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/PlayerPage.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/PlayerPage.java index a7a872155..7254e2cb7 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/PlayerPage.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/PlayerPage.java @@ -1,5 +1,9 @@ package nautilus.game.arcade.gui.privateServer.page; +import java.util.ArrayList; +import java.util.List; + +import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; @@ -13,9 +17,20 @@ import nautilus.game.arcade.gui.privateServer.PrivateServerShop; public abstract class PlayerPage extends BasePage { + private List _players; + private boolean useOtherList; + public PlayerPage(ArcadeManager plugin, PrivateServerShop shop, String pageName, Player player) { super(plugin, shop, pageName, player); + useOtherList = false; + } + + public PlayerPage(ArcadeManager plugin, PrivateServerShop shop, String pageName, Player player, List players) + { + super(plugin, shop, pageName, player); + useOtherList = true; + _players = players; } @Override @@ -23,7 +38,20 @@ public abstract class PlayerPage extends BasePage { addBackButton(4); - Player[] players = UtilServer.getPlayers(); + List players = null; + if (useOtherList) + { + players = new ArrayList<>(); + for (String s : _players) + { + players.add(Bukkit.getPlayer(s)); + } + } + else + { + for (Player p : UtilServer.getPlayers()) + players.add(p); + } int slot = 9; for (Player player : players) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/WhitelistedPage.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/WhitelistedPage.java index 4643fa21b..4ad9980bb 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/WhitelistedPage.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/WhitelistedPage.java @@ -1,5 +1,7 @@ package nautilus.game.arcade.gui.privateServer.page; +import java.util.List; + import org.bukkit.entity.Player; import mineplex.core.common.util.F; @@ -15,9 +17,9 @@ import nautilus.game.arcade.gui.privateServer.PrivateServerShop; */ public class WhitelistedPage extends PlayerPage { - public WhitelistedPage(ArcadeManager plugin, PrivateServerShop shop, Player player) + public WhitelistedPage(ArcadeManager plugin, PrivateServerShop shop, Player player, List players) { - super(plugin, shop, "Whitelisted Players", player); + super(plugin, shop, "Whitelisted Players", player, players); buildPage(); }