Used new Bukkit constructor format.

This commit is contained in:
FrozenCow 2011-02-21 16:22:16 +01:00
parent b097fb8321
commit 65f3ea4fe3
2 changed files with 5 additions and 10 deletions

View File

@ -41,12 +41,6 @@ public class DynmapPlugin extends JavaPlugin {
private Configuration configuration;
public static File tilesDirectory;
public static File dataRoot;
public DynmapPlugin(PluginLoader pluginLoader, Server instance, PluginDescriptionFile desc, File folder, File plugin, ClassLoader cLoader) {
super(pluginLoader, instance, desc, folder, plugin, cLoader);
dataRoot = folder;
}
public World getWorld() {
return getServer().getWorlds().get(0);
@ -69,7 +63,7 @@ public class DynmapPlugin extends JavaPlugin {
tilesDirectory = getFile(configuration.getString("tilespath", "web/tiles"));
tilesDirectory.mkdirs();
playerList = new PlayerList(getServer());
playerList = new PlayerList(getServer(), getFile("hiddenplayers.txt"));
playerList.load();
mapManager = new MapManager(configuration);
@ -148,7 +142,7 @@ public class DynmapPlugin extends JavaPlugin {
}
public File getFile(String path) {
return combinePaths(DynmapPlugin.dataRoot, path);
return combinePaths(getDataFolder(), path);
}
protected void loadDebuggers() {

View File

@ -16,10 +16,11 @@ import org.bukkit.entity.Player;
public class PlayerList {
private Server server;
private HashSet<String> hiddenPlayerNames = new HashSet<String>();
private File hiddenPlayersFile = new File(DynmapPlugin.dataRoot, "hiddenplayers.txt");
private File hiddenPlayersFile;
public PlayerList(Server server) {
public PlayerList(Server server, File hiddenPlayersFile) {
this.server = server;
this.hiddenPlayersFile = hiddenPlayersFile;
}
public void save() {