Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-02-11 09:51:35 +01:00
Code Issues Projects Releases Wiki Activity

chore: enforce and document notnull chunk loader, add noop impl

Browse Source
This commit is contained in:
mworzala 2024-07-08 11:58:15 -04:00
parent afae77a41c
commit 1903e8dff2
No known key found for this signature in database
GPG Key ID: B148F922E64797C7
3 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/net/minestom/server/instance/IChunkLoader.java
View File

@ -19,6 +19,10 @@ import java.util.concurrent.atomic.AtomicInteger;
*/
public interface IChunkLoader {
static @NotNull IChunkLoader noop() {
return NoopChunkLoaderImpl.INSTANCE;
}
/**
* Loads instance data from the loader.
*

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

@ -269,9 +269,7 @@ public class InstanceContainer extends Instance {
// Clear cache
this.chunks.remove(getChunkIndex(chunkX, chunkZ));
chunk.unload();
if (chunkLoader != null) {
chunkLoader.unloadChunk(chunk);
}
chunkLoader.unloadChunk(chunk);
var dispatcher = MinecraftServer.process().dispatcher();
dispatcher.deletePartition(chunk);
}
@ -588,17 +586,19 @@ public class InstanceContainer extends Instance {
*
* @return the {@link IChunkLoader} of this instance
*/
public IChunkLoader getChunkLoader() {
public @NotNull IChunkLoader getChunkLoader() {
return chunkLoader;
}
/**
* Changes the {@link IChunkLoader} of this instance (to change how chunks are retrieved when not already loaded).
*
* <p>{@link IChunkLoader#noop()} can be used to do nothing.</p>
*
* @param chunkLoader the new {@link IChunkLoader}
*/
public void setChunkLoader(IChunkLoader chunkLoader) {
this.chunkLoader = chunkLoader;
public void setChunkLoader(@NotNull IChunkLoader chunkLoader) {
this.chunkLoader = Objects.requireNonNull(chunkLoader, "Chunk loader cannot be null");
}
@Override

23
src/main/java/net/minestom/server/instance/NoopChunkLoaderImpl.java Normal file
View File

@ -0,0 +1,23 @@
package net.minestom.server.instance;
import net.minestom.server.utils.async.AsyncUtils;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.concurrent.CompletableFuture;
final class NoopChunkLoaderImpl implements IChunkLoader {
static final NoopChunkLoaderImpl INSTANCE = new NoopChunkLoaderImpl();
private NoopChunkLoaderImpl(){}
@Override
public @NotNull CompletableFuture<@Nullable Chunk> loadChunk(@NotNull Instance instance, int chunkX, int chunkZ) {
return CompletableFuture.completedFuture(null);
}
@Override
public @NotNull CompletableFuture<Void> saveChunk(@NotNull Chunk chunk) {
return AsyncUtils.VOID_FUTURE;
}
}