Fix vines to use foliagecolor shading, fix global default handling for swampshaded
This commit is contained in:
parent
658a4aba3f
commit
df81b096d7
3 changed files with 5 additions and 5 deletions
|
|
@ -83,6 +83,7 @@ public class DynmapPlugin extends JavaPlugin {
|
|||
public PlayerFaces playerfacemgr;
|
||||
public Events events = new Events();
|
||||
public String deftemplatesuffix = "";
|
||||
boolean swampshading = false;
|
||||
/* Flag to let code know that we're doing reload - make sure we don't double-register event handlers */
|
||||
public boolean is_reload = false;
|
||||
private boolean generate_only = false;
|
||||
|
|
@ -248,6 +249,8 @@ public class DynmapPlugin extends JavaPlugin {
|
|||
|
||||
Log.verbose = configuration.getBoolean("verbose", true);
|
||||
deftemplatesuffix = configuration.getString("deftemplatesuffix", "");
|
||||
/* Default swamp shading off for 1.8, on after */
|
||||
swampshading = configuration.getBoolean("swampshaded", !getServer().getVersion().contains("(MC: 1.8"));
|
||||
|
||||
loadDebuggers();
|
||||
|
||||
|
|
|
|||
|
|
@ -46,7 +46,6 @@ public class MapManager {
|
|||
private int parallelrendercnt = 0;
|
||||
private int progressinterval = 100;
|
||||
private boolean saverestorepending = true;
|
||||
private boolean swampshading = false;
|
||||
|
||||
private int zoomout_period = DEFAULT_ZOOMOUT_PERIOD; /* Zoom-out tile processing period, in seconds */
|
||||
/* Which fullrenders are active */
|
||||
|
|
@ -504,8 +503,6 @@ public class MapManager {
|
|||
progressinterval = configuration.getInteger("progressloginterval", 100);
|
||||
if(progressinterval < 100) progressinterval = 100;
|
||||
saverestorepending = configuration.getBoolean("saverestorepending", true);
|
||||
/* Default swamp shading off for 1.8, on after */
|
||||
swampshading = configuration.getBoolean("swampshaded", !plugin.getServer().getVersion().contains("(MC: 1.8"));
|
||||
|
||||
this.tileQueue = new AsynchronousQueue<MapTile>(
|
||||
new Handler<MapTile>() {
|
||||
|
|
@ -1004,6 +1001,6 @@ public class MapManager {
|
|||
}
|
||||
|
||||
public boolean getSwampShading() {
|
||||
return swampshading;
|
||||
return plug_in.swampshading;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue