From 888bb20e78cd942405183036a0537b4f50519395 Mon Sep 17 00:00:00 2001 From: NotMyFault Date: Tue, 19 Apr 2022 08:45:44 +0200 Subject: [PATCH 1/5] build: Release 6.6.3 --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index fbb588b3a..51722f41d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -18,7 +18,7 @@ plugins { idea } -version = "6.6.3-SNAPSHOT" +version = "6.6.3" allprojects { group = "com.plotsquared" From a7b3b3b7dfdc58a4d77ae59105283a311af05fc2 Mon Sep 17 00:00:00 2001 From: Alexander Brandes Date: Tue, 19 Apr 2022 08:50:50 +0200 Subject: [PATCH 2/5] build: Back to snapshot for development --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 51722f41d..c21177f5f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -18,7 +18,7 @@ plugins { idea } -version = "6.6.3" +version = "6.6.4-SNAPSHOT" allprojects { group = "com.plotsquared" From 8982b33b6cfb442c74693ea27759f8c6a29ec5b4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 25 Apr 2022 15:59:30 +0200 Subject: [PATCH 3/5] build: Update github/codeql-action action to v2 (#3589) Co-authored-by: Renovate Bot --- .github/workflows/codeql.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 From 0974fb28341eaab0396924f09aa91d3916aa465c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 25 Apr 2022 16:56:30 +0200 Subject: [PATCH 4/5] [ci skip] build: Update com.fastasyncworldedit to v2.1.2 (#3588) Co-authored-by: Renovate Bot --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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" From a6aaa9538f3ef516a8b1347c2572dab079d89853 Mon Sep 17 00:00:00 2001 From: Traks <58818927+traksag@users.noreply.github.com> Date: Sat, 30 Apr 2022 14:16:58 +0200 Subject: [PATCH 5/5] Set plot biome chunk by chunk (#3590) * Actually set plot biome chunk by chunk * Better variable name for chunk position --- .../plotsquared/core/util/RegionManager.java | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) 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();