Fixed ready signs without floor config; resolves #111

DRE2N · Jul 12, 2016 · d0c725d · d0c725d
1 parent 81be1be
commit d0c725d
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 8 deletions.
diff --git a/abstract/pom.xml b/abstract/pom.xml
@@ -8,6 +8,6 @@
     <parent>
         <groupId>io.github.dre2n</groupId>
         <artifactId>dungeonsxl</artifactId>
-        <version>0.14.1-SNAPSHOT</version>
+        <version>0.14.1</version>
     </parent>
 </project>
diff --git a/core/pom.xml b/core/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>io.github.dre2n</groupId>
         <artifactId>dungeonsxl</artifactId>
-        <version>0.14.1-SNAPSHOT</version>
+        <version>0.14.1</version>
     </parent>
     <build>
         <resources>

diff --git a/core/src/main/java/io/github/dre2n/dungeonsxl/sign/ReadySign.java b/core/src/main/java/io/github/dre2n/dungeonsxl/sign/ReadySign.java
@@ -156,7 +156,10 @@ private void ready(DGamePlayer dPlayer) {
         }
 
         if (getGameWorld().getClassesSigns().isEmpty() || dPlayer.getDClass() != null) {
-            GameType forced = getGameWorld().getConfig().getForcedGameType();
+            GameType forced = null;
+            if (getGameWorld().getConfig() != null) {
+                forced = getGameWorld().getConfig().getForcedGameType();
+            }
             dPlayer.ready(forced == null ? gameType : forced);
         }
 

diff --git a/core/src/main/java/io/github/dre2n/dungeonsxl/world/DResourceWorld.java b/core/src/main/java/io/github/dre2n/dungeonsxl/world/DResourceWorld.java
@@ -53,6 +53,11 @@ public DResourceWorld(DWorlds worlds, String name) {
             folder.mkdir();
         }
 
+        File configFile = new File(folder, "config.yml");
+        if (configFile.exists()) {
+            config = new WorldConfig(configFile);
+        }
+
         File signDataFile = new File(folder, "DXLData.data");
         signData = new SignData(signDataFile);
     }

diff --git a/craftbukkit_1_10_R1/pom.xml b/craftbukkit_1_10_R1/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>io.github.dre2n</groupId>
         <artifactId>dungeonsxl</artifactId>
-        <version>0.14.1-SNAPSHOT</version>
+        <version>0.14.1</version>
     </parent>
     <build>
         <plugins>

diff --git a/craftbukkit_1_9_R1/pom.xml b/craftbukkit_1_9_R1/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>io.github.dre2n</groupId>
         <artifactId>dungeonsxl</artifactId>
-        <version>0.14.1-SNAPSHOT</version>
+        <version>0.14.1</version>
     </parent>
     <build>
         <plugins>

diff --git a/craftbukkit_1_9_R2/pom.xml b/craftbukkit_1_9_R2/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>io.github.dre2n</groupId>
         <artifactId>dungeonsxl</artifactId>
-        <version>0.14.1-SNAPSHOT</version>
+        <version>0.14.1</version>
     </parent>
     <build>
         <plugins>

diff --git a/pom.xml b/pom.xml
@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.github.dre2n</groupId>
     <artifactId>dungeonsxl</artifactId>
-    <version>0.14.1-SNAPSHOT</version>
+    <version>0.14.1</version>
     <packaging>pom</packaging>
     <name>DungeonsXL</name>
     <url>https://dre2n.github.io</url>

diff --git a/shade/pom.xml b/shade/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>io.github.dre2n</groupId>
         <artifactId>dungeonsxl</artifactId>
-        <version>0.14.1-SNAPSHOT</version>
+        <version>0.14.1</version>
     </parent>
     <build>
         <finalName>dungeonsxl-${project.version}${buildNo}</finalName>