Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-12-25 18:17:37 +01:00
Code Issues Projects Releases Wiki Activity

Used new Bukkit constructor format.

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,12 +41,6 @@ public class DynmapPlugin extends JavaPlugin {
private Configuration configuration; private Configuration configuration;
public static File tilesDirectory; 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() { public World getWorld() {
return getServer().getWorlds().get(0); return getServer().getWorlds().get(0);
@ -69,7 +63,7 @@ public class DynmapPlugin extends JavaPlugin {
tilesDirectory = getFile(configuration.getString("tilespath", "web/tiles")); tilesDirectory = getFile(configuration.getString("tilespath", "web/tiles"));
tilesDirectory.mkdirs(); tilesDirectory.mkdirs();
playerList = new PlayerList(getServer()); playerList = new PlayerList(getServer(), getFile("hiddenplayers.txt"));
playerList.load(); playerList.load();
mapManager = new MapManager(configuration); mapManager = new MapManager(configuration);
@ -148,7 +142,7 @@ public class DynmapPlugin extends JavaPlugin {
} }
public File getFile(String path) { public File getFile(String path) {
return combinePaths(DynmapPlugin.dataRoot, path); return combinePaths(getDataFolder(), path);
} }
protected void loadDebuggers() { protected void loadDebuggers() {

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

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