fix cherry pick problem

coco875 · Aug 12, 2024 · d1f31e2 · d1f31e2
1 parent ac11656
commit d1f31e2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -131,3 +131,4 @@ compile_commands.json
 CTestTestfile.cmake
 _deps
 cmake-build-*/
+.vscode/launch.json
diff --git a/...cheduling/mixin/idle_tasks/autosave/enhanced_autosave/MixinThreadedAnvilChunkStorage.java b/...cheduling/mixin/idle_tasks/autosave/enhanced_autosave/MixinThreadedAnvilChunkStorage.java
@@ -6,12 +6,8 @@
 import it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator;
 import it.unimi.dsi.fastutil.objects.ObjectCollection;
 import net.minecraft.server.world.ChunkHolder;
-<<<<<<< HEAD
 import net.minecraft.server.world.ThreadedAnvilChunkStorage;
-=======
-import net.minecraft.server.world.ServerChunkLoadingManager;
 import net.minecraft.server.world.ServerWorld;
->>>>>>> f5d31bda (fix: respect isSavingDisabled in enhanced autosave)
 import net.minecraft.util.thread.ThreadExecutor;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;

diff --git a/gradlew.bat b/gradlew.bat
@@ -38,8 +38,8 @@ set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
+set JAVA_EXE=C:/Program Files/Java/jdk-17/bin/java.exe
+"%JAVA_EXE%" -version >NUL 2>&1
 if "%ERRORLEVEL%" == "0" goto execute
 
 echo.