Merge branch 'v7' into feature/v7/new-generation-api

# Conflicts:
#	Core/src/main/java/com/plotsquared/core/generator/IndependentPlotGenerator.java
#	Core/src/main/java/com/plotsquared/core/queue/QueueCoordinator.java
#	Core/src/main/java/com/plotsquared/core/util/ChunkManager.java
This commit is contained in:
dordsor21
2022-06-10 18:26:22 +01:00
7 changed files with 58 additions and 120 deletions

View File

@@ -42,6 +42,7 @@ public abstract class ChunkManager {
private static final Map<BlockVector2, RunnableVal<ZeroedDelegateScopedQueueCoordinator>> forceChunks = new ConcurrentHashMap<>();
private static final Map<BlockVector2, RunnableVal<ZeroedDelegateScopedQueueCoordinator>> addChunks = new ConcurrentHashMap<>();
@Deprecated(forRemoval = true, since = "TODO")
public static void setChunkInPlotArea(
RunnableVal<ZeroedDelegateScopedQueueCoordinator> force,
RunnableVal<ZeroedDelegateScopedQueueCoordinator> add,