diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index d7628e563..42526cb92 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -26,12 +26,12 @@ jobs: uses: actions/checkout@v3 - name: Initialize CodeQL - uses: github/codeql-action/init@v1 + uses: github/codeql-action/init@v2 with: languages: ${{ matrix.language }} - name: Autobuild - uses: github/codeql-action/autobuild@v1 + uses: github/codeql-action/autobuild@v2 - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v1 + uses: github/codeql-action/analyze@v2 diff --git a/Core/src/main/java/com/plotsquared/core/util/RegionManager.java b/Core/src/main/java/com/plotsquared/core/util/RegionManager.java index 45ed7e4c4..01542ead5 100644 --- a/Core/src/main/java/com/plotsquared/core/util/RegionManager.java +++ b/Core/src/main/java/com/plotsquared/core/util/RegionManager.java @@ -409,13 +409,26 @@ public abstract class RegionManager { ) { final QueueCoordinator queue = blockQueue.getNewQueue(worldUtil.getWeWorld(area.getWorldName())); queue.addReadChunks(region.getChunks()); - queue.setChunkConsumer(blockVector2 -> { + final BlockVector3 regionMin = region.getMinimumPoint(); + final BlockVector3 regionMax = region.getMaximumPoint(); + queue.setChunkConsumer(chunkPos -> { + BlockVector3 chunkMin = BlockVector3.at( + Math.max(chunkPos.getX() << 4, regionMin.getBlockX()), + regionMin.getBlockY(), + Math.max(chunkPos.getZ() << 4, regionMin.getBlockZ()) + ); + BlockVector3 chunkMax = BlockVector3.at( + Math.min((chunkPos.getX() << 4) + 15, regionMax.getBlockX()), + regionMax.getBlockY(), + Math.min((chunkPos.getZ() << 4) + 15, regionMax.getBlockZ()) + ); + CuboidRegion chunkRegion = new CuboidRegion(region.getWorld(), chunkMin, chunkMax); WorldUtil.setBiome( area.getWorldName(), - region, + chunkRegion, biome ); - worldUtil.refreshChunk(blockVector2.getBlockX(), blockVector2.getBlockZ(), area.getWorldName()); + worldUtil.refreshChunk(chunkPos.getBlockX(), chunkPos.getBlockZ(), area.getWorldName()); }); queue.setCompleteTask(whenDone); queue.enqueue(); diff --git a/build.gradle.kts b/build.gradle.kts index fbb588b3a..c21177f5f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -18,7 +18,7 @@ plugins { idea } -version = "6.6.3-SNAPSHOT" +version = "6.6.4-SNAPSHOT" allprojects { group = "com.plotsquared" diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 10f1156a3..537d3fb41 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -18,7 +18,7 @@ adventure-platform-bukkit = "4.0.1" # Plugins worldedit = "7.2.10" -fawe = "2.1.1" +fawe = "2.1.2" vault = "1.7.1" placeholderapi = "2.11.1" luckperms = "5.4"