Upstream/DungeonsXL
1
0
Fork 0
mirror of https://github.com/DRE2N/DungeonsXL.git synced 2025-03-09 13:19:04 +01:00
Code Issues Projects Releases Wiki Activity

Fixed ready signs without floor config; resolves #111

Browse Source
This commit is contained in:
Daniel Saukel 2016-07-12 23:54:12 +02:00
parent 81be1bec85
commit d0c725d2d7
9 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
abstract/pom.xml
View File

@ -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>

2
core/pom.xml
View File

@ -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>

5
core/src/main/java/io/github/dre2n/dungeonsxl/sign/ReadySign.java
View File

@ -156,7 +156,10 @@ public class ReadySign extends DSign {
}
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);
}

5
core/src/main/java/io/github/dre2n/dungeonsxl/world/DResourceWorld.java
View File

@ -53,6 +53,11 @@ public class DResourceWorld {
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);
}

2
craftbukkit_1_10_R1/pom.xml
View File

@ -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>

2
craftbukkit_1_9_R1/pom.xml
View File

@ -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>

2
craftbukkit_1_9_R2/pom.xml
View File

@ -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>

2
pom.xml
View File

@ -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>

2
shade/pom.xml
View File

@ -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>