Merge branch 'master' into 1.16

This commit is contained in:
gnembon committed 2020-03-04 00:31:14 -04:00
commit eb631ebda0
2 files changed
+5 -3

No files matched your search

@@ -72,7 +72,8 @@ public abstract class ThreadedAnvilChunkStorage_scarpetChunkCreationMixin implem
//in method_20617
//method_19534(Lnet/minecraft/server/world/ChunkHolder;Lnet/minecraft/world/chunk/Chunk;)Ljava/util/concurrent/CompletableFuture;
@Inject(method = "method_19534", at = @At(
// incmopatibility with optifine makes this mixin fail.
@Inject(method = "method_19534", require = 0, at = @At(
value = "INVOKE",
target = "Lnet/minecraft/server/world/ThreadedAnvilChunkStorage;convertToFullChunk(Lnet/minecraft/server/world/ChunkHolder;)Ljava/util/concurrent/CompletableFuture;",
shift = At.Shift.AFTER