Merge 1.19.2 into 1.20

embeddedt · embeddedt · commit 3fb3bb3c11fa · 2023-11-11T17:26:27.000-05:00
diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/chunk_deadlock/ServerChunkCacheMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/chunk_deadlock/ServerChunkCacheMixin.java
@@ -55,8 +55,6 @@ private void bailIfServerDead(int chunkX, int chunkZ, ChunkStatus requiredStatus
                 }
                 if(debugDeadServerAccess)
                     ModernFix.LOGGER.warn("Async loading of a chunk was requested, this might not be desirable", new Exception());
-                else
-                    ModernFix.LOGGER.warn("Suspicious async chunkload, pass -Dmodernfix.debugBadChunkloading=true for more details");
                 try {
                     resultingChunk = future.get(10, TimeUnit.SECONDS);
                     if(resultingChunk.left().isPresent()) {

Original file line number	Diff line number	Diff line change
`@@ -55,8 +55,6 @@ private void bailIfServerDead(int chunkX, int chunkZ, ChunkStatus requiredStatus`
`55`	`55`	`}`
`56`	`56`	`if(debugDeadServerAccess)`
`57`	`57`	`ModernFix.LOGGER.warn("Async loading of a chunk was requested, this might not be desirable", new Exception());`
`58`		`- else`
`59`		`- ModernFix.LOGGER.warn("Suspicious async chunkload, pass -Dmodernfix.debugBadChunkloading=true for more details");`
`60`	`58`	`try {`
`61`	`59`	`resultingChunk = future.get(10, TimeUnit.SECONDS);`
`62`	`60`	`if(resultingChunk.left().isPresent()) {`