Merge branch 'mc/1.13'

This commit is contained in:
Blue (Lukas Rieger) 2020-03-25 22:31:12 +01:00
commit 36f4fce757
2 changed files with 7 additions and 2 deletions

View File

@ -78,6 +78,11 @@ public void unregisterAllListeners() {
@Override
public UUID getUUIDForWorld(File worldFolder) throws IOException {
//if it is a dimension folder
if (!new File(worldFolder, "level.dat").exists()) {
worldFolder = worldFolder.getParentFile();
}
final File normalizedWorldFolder = worldFolder.getCanonicalFile();
Future<UUID> futureUUID;

View File

@ -134,7 +134,7 @@ maps: [
{
id: "end"
name: "End"
world: "world_the_end"
world: "world_the_end/DIM1"
# We dont want a blue sky in the end
skyColor: "#080010"
@ -150,7 +150,7 @@ maps: [
{
id: "nether"
name: "Nether"
world: "world_nether"
world: "world_nether/DIM-1"
skyColor: "#290000"