From 9f74767f7976453dadb8f8ed20343e057173be85 Mon Sep 17 00:00:00 2001 From: IzzelAliz Date: Fri, 1 Apr 2022 20:45:40 +0800 Subject: [PATCH] Update upstream --- .../mixin/core/server/level/ChunkHolderMixin.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/level/ChunkHolderMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/level/ChunkHolderMixin.java index ffebf6c3..31282d3f 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/level/ChunkHolderMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/level/ChunkHolderMixin.java @@ -37,14 +37,14 @@ public abstract class ChunkHolderMixin implements ChunkHolderBridge { @Override @Accessor("oldTicketLevel") public abstract int bridge$getOldTicketLevel(); // @formatter:on - public LevelChunk getFullChunk() { + public LevelChunk getFullChunkNow() { if (!ChunkHolder.getFullChunkStatus(this.oldTicketLevel).isOrAfter(ChunkHolder.FullChunkStatus.BORDER)) { return null; // note: using oldTicketLevel for isLoaded checks } - return this.getFullChunkUnchecked(); + return this.getFullChunkNowUnchecked(); } - public LevelChunk getFullChunkUnchecked() { + public LevelChunk getFullChunkNowUnchecked() { CompletableFuture> statusFuture = this.getFutureIfPresentUnchecked(ChunkStatus.FULL); Either either = statusFuture.getNow(null); return (either == null) ? null : (LevelChunk) either.left().orElse(null); @@ -52,12 +52,12 @@ public abstract class ChunkHolderMixin implements ChunkHolderBridge { @Override public LevelChunk bridge$getFullChunk() { - return this.getFullChunk(); + return this.getFullChunkNow(); } @Override public LevelChunk bridge$getFullChunkUnchecked() { - return this.getFullChunkUnchecked(); + return this.getFullChunkNowUnchecked(); } @Inject(method = "blockChanged", cancellable = true, locals = LocalCapture.CAPTURE_FAILHARD,