Merge branch '1.20.4' into 1.20.6

# Conflicts: # settings.gradle.kts
rfresh2 · Jan 24, 2025 · a529b3d · a529b3d
2 parents 0c359d1 + df69a23
commit a529b3d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/...rc/main/java/xaeroplus/feature/render/highlights/ChunkHighlightCacheDimensionHandler.java b/...rc/main/java/xaeroplus/feature/render/highlights/ChunkHighlightCacheDimensionHandler.java
@@ -106,6 +106,7 @@ public ListenableFuture<Long2LongMap> getHighlightsInCustomWindow(int windowRegi
                                 map.put(chunkPos, entry.getLongValue());
                             }
                         }
+                        lock.readLock().unlock();
                     }
                 } catch (final Exception e) {
                     XaeroPlus.LOGGER.error("Failed to load highlights in custom window for {} disk cache dimension: {}", database.databaseName, dimension.location(), e);

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -9,7 +9,7 @@ pluginManagement {
 	}
 }
 gradle.extra.apply {
-	set("mod_version", "2.25.2")
+	set("mod_version", "2.25.3")
 	set("minecraft_version", "1.20.6")
 	set("parchment_version", "2024.06.16")
     set("worldmap_version_fabric", "1.39.2")