Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2025-02-16 11:51:58 +01:00
Code Issues Projects Releases Wiki Activity

Option to treat hiddenplayers.txt as a whitelist.

Browse Source
This commit is contained in:
zeeZ 2011-04-11 04:10:47 +02:00
parent ab6352a17d
commit 69fcc1706e
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configuration.txt
View File

@ -1,5 +1,8 @@
# All paths in this configuration file are relative to Dynmap's data-folder: minecraft_server/plugins/dynmap/ # All paths in this configuration file are relative to Dynmap's data-folder: minecraft_server/plugins/dynmap/
# Treat hiddenplayers.txt as a whitelist for players to be shown on the map? (Default false)
display-whitelist: false
# How often a tile gets rendered (in seconds). # How often a tile gets rendered (in seconds).
renderinterval: 1 renderinterval: 1

10
src/main/java/org/dynmap/DynmapPlugin.java
View File

@ -88,7 +88,7 @@ public class DynmapPlugin extends JavaPlugin {
log.warning("Could not create directory for tiles ('" + tilesDirectory + "')."); log.warning("Could not create directory for tiles ('" + tilesDirectory + "').");
} }
playerList = new PlayerList(getServer(), getFile("hiddenplayers.txt")); playerList = new PlayerList(getServer(), getFile("hiddenplayers.txt"), configuration);
playerList.load(); playerList.load();
mapManager = new MapManager(this, configuration); mapManager = new MapManager(this, configuration);
@ -320,13 +320,13 @@ public class DynmapPlugin extends JavaPlugin {
} else if (c.equals("hide")) { } else if (c.equals("hide")) {
if (args.length == 1) { if (args.length == 1) {
if(player != null && checkPlayerPermission(sender,"hide.self")) { if(player != null && checkPlayerPermission(sender,"hide.self")) {
playerList.hide(player.getName()); playerList.setVisible(player.getName(),false);
sender.sendMessage("You are now hidden on Dynmap."); sender.sendMessage("You are now hidden on Dynmap.");
return true; return true;
} }
} else if (checkPlayerPermission(sender,"hide.others")) { } else if (checkPlayerPermission(sender,"hide.others")) {
for (int i = 1; i < args.length; i++) { for (int i = 1; i < args.length; i++) {
playerList.hide(args[i]); playerList.setVisible(args[i],false);
sender.sendMessage(args[i] + " is now hidden on Dynmap."); sender.sendMessage(args[i] + " is now hidden on Dynmap.");
} }
return true; return true;
@ -334,13 +334,13 @@ public class DynmapPlugin extends JavaPlugin {
} else if (c.equals("show")) { } else if (c.equals("show")) {
if (args.length == 1) { if (args.length == 1) {
if(player != null && checkPlayerPermission(sender,"show.self")) { if(player != null && checkPlayerPermission(sender,"show.self")) {
playerList.show(player.getName()); playerList.setVisible(player.getName(),true);
sender.sendMessage("You are now visible on Dynmap."); sender.sendMessage("You are now visible on Dynmap.");
return true; return true;
} }
} else if (checkPlayerPermission(sender,"show.others")) { } else if (checkPlayerPermission(sender,"show.others")) {
for (int i = 1; i < args.length; i++) { for (int i = 1; i < args.length; i++) {
playerList.show(args[i]); playerList.setVisible(args[i],true);
sender.sendMessage(args[i] + " is now visible on Dynmap."); sender.sendMessage(args[i] + " is now visible on Dynmap.");
} }
return true; return true;

11
src/main/java/org/dynmap/PlayerList.java
View File

@ -12,15 +12,18 @@ import java.util.Scanner;
import org.bukkit.Server; import org.bukkit.Server;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.util.config.Configuration;
public class PlayerList { public class PlayerList {
private Server server; private Server server;
private HashSet<String> hiddenPlayerNames = new HashSet<String>(); private HashSet<String> hiddenPlayerNames = new HashSet<String>();
private File hiddenPlayersFile; private File hiddenPlayersFile;
private Configuration configuration;
public PlayerList(Server server, File hiddenPlayersFile) { public PlayerList(Server server, File hiddenPlayersFile, Configuration configuration) {
this.server = server; this.server = server;
this.hiddenPlayersFile = hiddenPlayersFile; this.hiddenPlayersFile = hiddenPlayersFile;
this.configuration = configuration;
} }
public void save() { public void save() {
@ -63,7 +66,7 @@ public class PlayerList {
} }
public void setVisible(String playerName, boolean visible) { public void setVisible(String playerName, boolean visible) {
if (visible) if (visible ^ configuration.getBoolean("display-whitelist", false))
show(playerName); show(playerName);
else else
hide(playerName); hide(playerName);
@ -75,7 +78,7 @@ public class PlayerList {
Player[] onlinePlayers = server.getOnlinePlayers(); Player[] onlinePlayers = server.getOnlinePlayers();
for (int i = 0; i < onlinePlayers.length; i++) { for (int i = 0; i < onlinePlayers.length; i++) {
Player p = onlinePlayers[i]; Player p = onlinePlayers[i];
if (p.getWorld().getName().equals(worldName) && !hiddenPlayerNames.contains(p.getName().toLowerCase())) { if (p.getWorld().getName().equals(worldName) && !(configuration.getBoolean("display-whitelist", false) ^ hiddenPlayerNames.contains(p.getName().toLowerCase()))) {
visiblePlayers.add(p); visiblePlayers.add(p);
} }
} }
@ -89,7 +92,7 @@ public class PlayerList {
Player[] onlinePlayers = server.getOnlinePlayers(); Player[] onlinePlayers = server.getOnlinePlayers();
for (int i = 0; i < onlinePlayers.length; i++) { for (int i = 0; i < onlinePlayers.length; i++) {
Player p = onlinePlayers[i]; Player p = onlinePlayers[i];
if (!hiddenPlayerNames.contains(p.getName().toLowerCase())) { if (!(configuration.getBoolean("display-whitelist", false) ^ hiddenPlayerNames.contains(p.getName().toLowerCase()))) {
visiblePlayers.add(p); visiblePlayers.add(p);
} }
} }