Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-11-28 13:15:30 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source 
Conflicts:
	src/main/java/org/dynmap/bukkit/DynmapPlugin.java
This commit is contained in:
Mike Primm 2012-01-22 16:31:37 -06:00
commit 8e4eaf77aa
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/dynmap/bukkit/DynmapPlugin.java
View File

@ -58,6 +58,7 @@ import org.dynmap.DynmapWebChatEvent;
import org.dynmap.DynmapWorld; import org.dynmap.DynmapWorld;
import org.dynmap.Log; import org.dynmap.Log;
import org.dynmap.MapManager; import org.dynmap.MapManager;
import org.dynmap.PlayerList;
import org.dynmap.bukkit.permissions.BukkitPermissions; import org.dynmap.bukkit.permissions.BukkitPermissions;
import org.dynmap.bukkit.permissions.NijikokunPermissions; import org.dynmap.bukkit.permissions.NijikokunPermissions;
import org.dynmap.bukkit.permissions.OpPermissions; import org.dynmap.bukkit.permissions.OpPermissions;
@ -76,7 +77,7 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
public BukkitEventProcessor bep; public BukkitEventProcessor bep;
public SnapshotCache sscache; public SnapshotCache sscache;
private boolean has_spout = false; private boolean has_spout = false;
public PlayerList playerList;
private MapManager mapManager; private MapManager mapManager;
public static DynmapPlugin plugin; public static DynmapPlugin plugin;
@ -381,6 +382,7 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
this.setEnabled(false); this.setEnabled(false);
return; return;
} }
playerList = core.playerList;
sscache = new SnapshotCache(core.getSnapShotCacheSize()); sscache = new SnapshotCache(core.getSnapShotCacheSize());
/* Get map manager from core */ /* Get map manager from core */