Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-01-22 08:02:31 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #49 from Nesaak/master

Browse Source 
Rename some old StorageFolder messages & comments
This commit is contained in:
TheMode 2020-09-03 01:21:28 +02:00 committed by GitHub
commit 08fd077d51
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/net/minestom/server/instance/InstanceContainer.java
View File

@ -80,7 +80,7 @@ public class InstanceContainer extends Instance {
this.storageLocation = storageLocation; this.storageLocation = storageLocation;
this.chunkLoader = new MinestomBasicChunkLoader(storageLocation); this.chunkLoader = new MinestomBasicChunkLoader(storageLocation);
// Get instance data from the saved data if a StorageFolder is defined // Get instance data from the saved data if a StorageLocation is defined
if (storageLocation != null) { if (storageLocation != null) {
// Retrieve instance data // Retrieve instance data
this.uniqueId = storageLocation.getOrDefault(UUID_KEY, UUID.class, uniqueId); this.uniqueId = storageLocation.getOrDefault(UUID_KEY, UUID.class, uniqueId);
@ -324,7 +324,7 @@ public class InstanceContainer extends Instance {
callback.accept(chunk); callback.accept(chunk);
} else { } else {
if (hasEnabledAutoChunkLoad()) { if (hasEnabledAutoChunkLoad()) {
// Load chunk from StorageFolder or with ChunkGenerator // Load chunk from StorageLocation or with ChunkGenerator
retrieveChunk(chunkX, chunkZ, callback); retrieveChunk(chunkX, chunkZ, callback);
} else { } else {
// Chunk not loaded, return null // Chunk not loaded, return null
@ -361,7 +361,7 @@ public class InstanceContainer extends Instance {
* @param callback the callback * @param callback the callback
*/ */
public void saveInstance(Runnable callback) { public void saveInstance(Runnable callback) {
Check.notNull(getStorageLocation(), "You cannot save the instance if no StorageFolder has been defined"); Check.notNull(getStorageLocation(), "You cannot save the instance if no StorageLocation has been defined");
this.storageLocation.set(UUID_KEY, getUniqueId(), UUID.class); this.storageLocation.set(UUID_KEY, getUniqueId(), UUID.class);
final Data data = getData(); final Data data = getData();
@ -386,13 +386,13 @@ public class InstanceContainer extends Instance {
@Override @Override
public void saveChunkToStorage(Chunk chunk, Runnable callback) { public void saveChunkToStorage(Chunk chunk, Runnable callback) {
Check.notNull(getStorageLocation(), "You cannot save the chunk if no StorageFolder has been defined"); Check.notNull(getStorageLocation(), "You cannot save the chunk if no StorageLocation has been defined");
chunkLoader.saveChunk(chunk, callback); chunkLoader.saveChunk(chunk, callback);
} }
@Override @Override
public void saveChunksToStorage(Runnable callback) { public void saveChunksToStorage(Runnable callback) {
Check.notNull(getStorageLocation(), "You cannot save the instance if no StorageFolder has been defined"); Check.notNull(getStorageLocation(), "You cannot save the instance if no StorageLocation has been defined");
if (chunkLoader.supportsParallelSaving()) { if (chunkLoader.supportsParallelSaving()) {
ExecutorService parallelSavingThreadPool = new MinestomThread(MinecraftServer.THREAD_COUNT_PARALLEL_CHUNK_SAVING, MinecraftServer.THREAD_NAME_PARALLEL_CHUNK_SAVING, true); ExecutorService parallelSavingThreadPool = new MinestomThread(MinecraftServer.THREAD_COUNT_PARALLEL_CHUNK_SAVING, MinecraftServer.THREAD_NAME_PARALLEL_CHUNK_SAVING, true);
getChunks().forEach(c -> parallelSavingThreadPool.execute(() -> { getChunks().forEach(c -> parallelSavingThreadPool.execute(() -> {