Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-09-30 04:37:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Correctly handle coordinates in swapping

Browse Source 
Fixes #3030
This commit is contained in:
dordsor21 2021-06-08 20:31:53 +01:00
parent 2ac5fe45e3
commit 19e97a7738
No known key found for this signature in database
GPG Key ID: 1E53E88969FFCF0B
1 changed files with 45 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
Core/src/main/java/com/plotsquared/core/util/RegionManager.java
View File

@ -47,10 +47,10 @@ import com.sk89q.worldedit.regions.CuboidRegion;
import com.sk89q.worldedit.regions.Region; import com.sk89q.worldedit.regions.Region;
import com.sk89q.worldedit.world.World; import com.sk89q.worldedit.world.World;
import com.sk89q.worldedit.world.biome.BiomeType; import com.sk89q.worldedit.world.biome.BiomeType;
import org.checkerframework.checker.nullness.qual.NonNull;
import org.checkerframework.checker.nullness.qual.Nullable;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import org.checkerframework.checker.nullness.qual.NonNull;
import org.checkerframework.checker.nullness.qual.Nullable;
import java.io.File; import java.io.File;
import java.util.Collection; import java.util.Collection;
@ -206,7 +206,7 @@ public abstract class RegionManager {
final com.sk89q.worldedit.world.World newWorld = worldUtil.getWeWorld(newPos.getWorldName()); final com.sk89q.worldedit.world.World newWorld = worldUtil.getWeWorld(newPos.getWorldName());
final QueueCoordinator copyFrom = blockQueue.getNewQueue(oldWorld); final QueueCoordinator copyFrom = blockQueue.getNewQueue(oldWorld);
final BasicQueueCoordinator copyTo = (BasicQueueCoordinator) blockQueue.getNewQueue(newWorld); final BasicQueueCoordinator copyTo = (BasicQueueCoordinator) blockQueue.getNewQueue(newWorld);
copyFromTo(pos1, pos2, relX, relZ, oldWorld, copyFrom, copyTo, false); setCopyFromToConsumer(pos1, pos2, relX, relZ, oldWorld, copyFrom, copyTo, false);
copyFrom.setCompleteTask(copyTo::enqueue); copyFrom.setCompleteTask(copyTo::enqueue);
if (actor != null && Settings.QUEUE.NOTIFY_PROGRESS) { if (actor != null && Settings.QUEUE.NOTIFY_PROGRESS) {
copyFrom.addProgressSubscriber(subscriberFactory copyFrom.addProgressSubscriber(subscriberFactory
@ -284,18 +284,31 @@ public abstract class RegionManager {
QueueCoordinator toQueue1 = blockQueue.getNewQueue(world1); QueueCoordinator toQueue1 = blockQueue.getNewQueue(world1);
QueueCoordinator toQueue2 = blockQueue.getNewQueue(world2); QueueCoordinator toQueue2 = blockQueue.getNewQueue(world2);
copyFromTo(pos1, pos2, relX, relZ, world1, fromQueue1, toQueue2, true); setCopyFromToConsumer(pos1, pos2, relX, relZ, world1, fromQueue1, toQueue2, true);
copyFromTo(pos1, pos2, relX, relZ, world1, fromQueue2, toQueue1, true); setCopyFromToConsumer(pos1.add(relX, 0, relZ), pos2.add(relX, 0, relZ), -relX, -relZ, world1, fromQueue2, toQueue1,
fromQueue1.setCompleteTask(fromQueue2::enqueue); true
);
toQueue2.setCompleteTask(whenDone::run);
if (actor != null && Settings.QUEUE.NOTIFY_PROGRESS) { if (actor != null && Settings.QUEUE.NOTIFY_PROGRESS) {
fromQueue1.addProgressSubscriber(subscriberFactory toQueue2.addProgressSubscriber(subscriberFactory.createFull(
.createFull( actor,
actor, Settings.QUEUE.NOTIFY_INTERVAL,
Settings.QUEUE.NOTIFY_INTERVAL, Settings.QUEUE.NOTIFY_WAIT,
Settings.QUEUE.NOTIFY_WAIT, TranslatableCaption.of("swap.progress_region2_paste")
TranslatableCaption.of("swap.progress_region1_copy") ));
));
} }
toQueue1.setCompleteTask(toQueue2::enqueue);
if (actor != null && Settings.QUEUE.NOTIFY_PROGRESS) {
toQueue1.addProgressSubscriber(subscriberFactory.createFull(
actor,
Settings.QUEUE.NOTIFY_INTERVAL,
Settings.QUEUE.NOTIFY_WAIT,
TranslatableCaption.of("swap.progress_region1_paste")
));
}
fromQueue2.setCompleteTask(toQueue1::enqueue); fromQueue2.setCompleteTask(toQueue1::enqueue);
if (actor != null && Settings.QUEUE.NOTIFY_PROGRESS) { if (actor != null && Settings.QUEUE.NOTIFY_PROGRESS) {
fromQueue2.addProgressSubscriber(subscriberFactory fromQueue2.addProgressSubscriber(subscriberFactory
@ -306,33 +319,28 @@ public abstract class RegionManager {
TranslatableCaption.of("swap.progress_region2_copy") TranslatableCaption.of("swap.progress_region2_copy")
)); ));
} }
toQueue1.setCompleteTask(toQueue2::enqueue);
fromQueue1.setCompleteTask(fromQueue2::enqueue);
if (actor != null && Settings.QUEUE.NOTIFY_PROGRESS) { if (actor != null && Settings.QUEUE.NOTIFY_PROGRESS) {
toQueue1.addProgressSubscriber(subscriberFactory.createFull(actor, fromQueue1.addProgressSubscriber(subscriberFactory
Settings.QUEUE.NOTIFY_INTERVAL, .createFull(
Settings.QUEUE.NOTIFY_WAIT, actor,
TranslatableCaption.of("swap.progress_region1_paste") Settings.QUEUE.NOTIFY_INTERVAL,
)); Settings.QUEUE.NOTIFY_WAIT,
} TranslatableCaption.of("swap.progress_region1_copy")
toQueue2.setCompleteTask(whenDone); ));
if (actor != null && Settings.QUEUE.NOTIFY_PROGRESS) {
toQueue2.addProgressSubscriber(subscriberFactory.createFull(actor,
Settings.QUEUE.NOTIFY_INTERVAL,
Settings.QUEUE.NOTIFY_WAIT,
TranslatableCaption.of("swap.progress_region2_paste")
));
} }
fromQueue1.enqueue(); fromQueue1.enqueue();
} }
private void copyFromTo( private void setCopyFromToConsumer(
Location pos1, final Location pos1,
Location pos2, final Location pos2,
int relX, int relX,
int relZ, int relZ,
World world1, final World world1,
QueueCoordinator fromQueue, final QueueCoordinator fromQueue,
QueueCoordinator toQueue, final QueueCoordinator toQueue,
boolean removeEntities boolean removeEntities
) { ) {
fromQueue.setChunkConsumer(chunk -> { fromQueue.setChunkConsumer(chunk -> {
@ -340,10 +348,10 @@ public abstract class RegionManager {
int cz = chunk.getZ(); int cz = chunk.getZ();
int cbx = cx << 4; int cbx = cx << 4;
int cbz = cz << 4; int cbz = cz << 4;
int bx = Math.max(pos1.getX() & 15, 0); int bx = Math.max(pos1.getX(), cbx) & 15;
int bz = Math.max(pos1.getZ() & 15, 0); int bz = Math.max(pos1.getZ(), cbz) & 15;
int tx = Math.min(pos2.getX() & 15, 15); int tx = Math.min(pos2.getX(), cbx + 15) & 15;
int tz = Math.min(pos2.getZ() & 15, 15); int tz = Math.min(pos2.getZ(), cbz + 15) & 15;
for (int y = 0; y < 256; y++) { for (int y = 0; y < 256; y++) {
for (int x = bx; x <= tx; x++) { for (int x = bx; x <= tx; x++) {
for (int z = bz; z <= tz; z++) { for (int z = bz; z <= tz; z++) {