Skip to content

GitLab

Verified Commit b9fc829b authored by Yannick Schinko's avatar Yannick Schinko
Browse files

Merge branch 'master' of github.com:Poniverse/Dynmap-Multiserver into master

parents 66c9af21 4822dd2a
Hide whitespace changes
Inline Side-by-side
pom.xml
View file @ b9fc829b
......@@ -4,9 +4,9 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>net.cubespace.dynmap</groupId>
<artifactId>Dynmap-MultiServer</artifactId>
<version>0.5.0</version>
<groupId>net.cubespace.dynmap</groupId>
<artifactId>Dynmap-MultiServer</artifactId>
<version>0.5.1</version>
<build>
<defaultGoal>clean install</defaultGoal>
......@@ -103,61 +103,56 @@
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.2.4</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.5</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.7.5</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>1.13</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>20030203.000550</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
<version>4.1.42.Final</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>20030203.000129</version>
</dependency>
<dependency>
<groupId>net.lingala.zip4j</groupId>
<artifactId>zip4j</artifactId>
<version>1.3.1</version>
</dependency>
<dependency>
<groupId>net.cubespace</groupId>
<artifactId>Yamler-Core</artifactId>
<version>2.3.1-20150720.092759-2</version>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
<version>1.1.1</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
<dependencies>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.2.4</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.5</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.7.5</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>1.13</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>20030203.000550</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
<version>4.0.14.Final</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>20030203.000129</version>
</dependency>
<dependency>
<groupId>net.lingala.zip4j</groupId>
<artifactId>zip4j</artifactId>
<version>1.3.1</version>
</dependency>
<dependency>
<groupId>net.cubespace</groupId>
<artifactId>Yamler-Core</artifactId>
<version>2.3.1-20150720.092759-2</version>
</dependency>
</dependencies>
</project>
src/main/java/net/cubespace/dynmap/multiserver/Config/Main.java
View file @ b9fc829b
......@@ -21,5 +21,9 @@ public class Main extends Config {
public String Webserver_webDir = "web/";
public String Webserver_Title = "Awesome Multiserver Dynmap";
public Integer Webserver_WorkerThreads = 16;
public String Webserver_DefaultWorld = "world";
public String Webserver_DefaultMap = "flat";
public ArrayList<Dynmap> DynMap = new ArrayList<>();
}
src/main/java/net/cubespace/dynmap/multiserver/HTTP/Handler/DynmapConfigJSONHandler.java
View file @ b9fc829b
......@@ -62,8 +62,8 @@ public class DynmapConfigJSONHandler implements IHandler {
if (config == null) {
config = new DynmapConfig();
config.setDefaultmap("flat");
config.setDefaultworld("world");
config.setDefaultmap(mainConfig.Webserver_DefaultMap);
config.setDefaultworld(mainConfig.Webserver_DefaultWorld);
config.setConfighash(0);
config.setTitle(mainConfig.Webserver_Title);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment