diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/mimicObject/ChunkLoader.java b/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/mimicObject/ChunkLoader.java index dc5743922..efb8ca4e1 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/mimicObject/ChunkLoader.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/mimicObject/ChunkLoader.java @@ -204,7 +204,7 @@ public class ChunkLoader ChunkPos actualPos = new ChunkPos(tagLevel.getInt("xPos"), tagLevel.getInt("zPos")); if (!Objects.equals(chunkPos, actualPos)) { - LOGGER.error("Chunk file at "+chunkPos+" is in the wrong location; Ignoring. (Expected "+chunkPos+", got "+actualPos+")"); + LOGGER.warn("Chunk file at "+chunkPos+" is in the wrong location; Ignoring. (Expected "+chunkPos+", got "+actualPos+")"); return null; } diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/mimicObject/RegionFileStorageExternalCache.java b/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/mimicObject/RegionFileStorageExternalCache.java index 47eb22fa7..171369116 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/mimicObject/RegionFileStorageExternalCache.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/mimicObject/RegionFileStorageExternalCache.java @@ -47,16 +47,8 @@ public class RegionFileStorageExternalCache implements AutoCloseable { { long posLong = ChunkPos.asLong(pos.getRegionX(), pos.getRegionZ()); RegionFile rFile; - // First check our custom cache - for (RegionFileCache cache : this.regionFileCache) - { - if (cache.pos == posLong) - { - return cache.file; - } - } - - // Then check vanilla cache + + // Check vanilla cache while (true) { try @@ -74,6 +66,15 @@ public class RegionFileStorageExternalCache implements AutoCloseable { { return rFile; } + + // Then check our custom cache + for (RegionFileCache cache : this.regionFileCache) + { + if (cache.pos == posLong) + { + return cache.file; + } + } // Otherwise, check if file exist, and if so, add it to the cache Path p = storage.folder; diff --git a/coreSubProjects b/coreSubProjects index d2bb99fb4..25ba274a3 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit d2bb99fb4b54c72b4595226b12cd8fe6451966c5 +Subproject commit 25ba274a36da9a645403fcefbec93a5f1511a17b