Sulkta-OSS/dynmap-neoforge
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Shift internal server check earlier

Browse source
This commit is contained in:
Mike Primm 2020-12-31 16:50:48 -06:00
parent 030ca17a1e
commit c3d944a652
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
DynmapCore/src/main/java/org/dynmap/DynmapCore.java
View file

@ -394,6 +394,9 @@ public class DynmapCore implements DynmapCommonAPI {
configuration = new ConfigurationNode(f); configuration = new ConfigurationNode(f);
configuration.load(); configuration.load();
// Check if we are disabling the internal web server (implies external)
isInternalWebServerDisabled = configuration.getBoolean("disable-webserver", false);
/* Prime the tiles directory */ /* Prime the tiles directory */
tilesDirectory = getFile(configuration.getString("tilespath", "web/tiles")); tilesDirectory = getFile(configuration.getString("tilespath", "web/tiles"));
if (!tilesDirectory.isDirectory() && !tilesDirectory.mkdirs()) { if (!tilesDirectory.isDirectory() && !tilesDirectory.mkdirs()) {
@ -531,8 +534,6 @@ public class DynmapCore implements DynmapCommonAPI {
updateplayerlimit = configuration.getInteger("updateplayerlimit", 0); updateplayerlimit = configuration.getInteger("updateplayerlimit", 0);
/* Load sort permission nodes */ /* Load sort permission nodes */
sortPermissionNodes = configuration.getStrings("player-sort-permission-nodes", null); sortPermissionNodes = configuration.getStrings("player-sort-permission-nodes", null);
// Check if we are disabling the internal web server (implies external)
isInternalWebServerDisabled = configuration.getBoolean("disable-webserver", false);
perTickLimit = configuration.getInteger("per-tick-time-limit", 50); perTickLimit = configuration.getInteger("per-tick-time-limit", 50);
if (perTickLimit < 5) perTickLimit = 5; if (perTickLimit < 5) perTickLimit = 5;