Whitelist fixes etc.

This commit is contained in:
William Burns 2015-08-03 13:40:13 +01:00
parent 0c5cc25634
commit 817b8b03f6
4 changed files with 45 additions and 7 deletions

View File

@ -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];

View File

@ -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<String> strings = new ArrayList<>();
for (String s : _arcadeManager.GetGameHostManager().getWhitelist())
{
strings.add(s);
}
_shop.openPageForPlayer(player, new WhitelistedPage(_arcadeManager, _shop, player, strings));
}
}

View File

@ -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<String> _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<String> 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<Player> 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)

View File

@ -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<String> players)
{
super(plugin, shop, "Whitelisted Players", player);
super(plugin, shop, "Whitelisted Players", player, players);
buildPage();
}