2023-03-07 23:41:00 +01:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
|
|
|
|
Date: Tue, 7 Mar 2023 14:34:09 -0800
|
|
|
|
Subject: [PATCH] Add API for checking ownership of region by position/entity
|
|
|
|
|
|
|
|
This may be useful for plugins which want to perform operations
|
|
|
|
over large areas outside of the buffer zone provided by the
|
|
|
|
regionaliser, as it is not guaranteed that anything outside
|
|
|
|
of the buffer zone is owned. Then, the plugins may use
|
|
|
|
the schedulers depending on the result of the ownership
|
|
|
|
check.
|
|
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
2023-03-25 18:50:36 +01:00
|
|
|
index 7986b9fcaf256e9042f6d9ddc38e8bd76645cbb7..a1295698beee025120beb3d151e77646bb44723b 100644
|
2023-03-07 23:41:00 +01:00
|
|
|
--- a/src/main/java/org/bukkit/Bukkit.java
|
|
|
|
+++ b/src/main/java/org/bukkit/Bukkit.java
|
2023-03-23 10:51:04 +01:00
|
|
|
@@ -2496,6 +2496,100 @@ public final class Bukkit {
|
2023-03-20 00:43:34 +01:00
|
|
|
public static @NotNull io.papermc.paper.threadedregions.scheduler.GlobalRegionScheduler getGlobalRegionScheduler() {
|
|
|
|
return server.getGlobalRegionScheduler();
|
2023-03-07 23:41:00 +01:00
|
|
|
}
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Returns whether the current thread is ticking a region and that the region being ticked
|
|
|
|
+ * owns the chunk at the specified world and block position.
|
|
|
|
+ * @param world Specified world.
|
|
|
|
+ * @param position Specified block position.
|
|
|
|
+ */
|
2023-03-25 18:50:36 +01:00
|
|
|
+ public static boolean isOwnedByCurrentRegion(@NotNull World world, @NotNull io.papermc.paper.math.Position position) {
|
2023-03-07 23:41:00 +01:00
|
|
|
+ return server.isOwnedByCurrentRegion(world, position);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Returns whether the current thread is ticking a region and that the region being ticked
|
|
|
|
+ * owns the chunks centered at the specified block position within the specified square radius.
|
|
|
|
+ * Specifically, this function checks that every chunk with position x in [centerX - radius, centerX + radius] and
|
|
|
|
+ * position z in [centerZ - radius, centerZ + radius] is owned by the current ticking region.
|
|
|
|
+ * @param world Specified world.
|
|
|
|
+ * @param position Specified block position.
|
|
|
|
+ * @param squareRadiusChunks Specified square radius. Must be >= 0. Note that this parameter is <i>not</i> a <i>squared</i>
|
|
|
|
+ * radius, but rather a <i>Chebyshev Distance</i>.
|
|
|
|
+ */
|
2023-03-25 18:50:36 +01:00
|
|
|
+ public static boolean isOwnedByCurrentRegion(@NotNull World world, @NotNull io.papermc.paper.math.Position position, int squareRadiusChunks) {
|
2023-03-07 23:41:00 +01:00
|
|
|
+ return server.isOwnedByCurrentRegion(world, position, squareRadiusChunks);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Returns whether the current thread is ticking a region and that the region being ticked
|
|
|
|
+ * owns the chunk at the specified world and block position as included in the specified location.
|
|
|
|
+ * @param location Specified location, must have a non-null world.
|
|
|
|
+ */
|
|
|
|
+ public static boolean isOwnedByCurrentRegion(@NotNull Location location) {
|
|
|
|
+ return server.isOwnedByCurrentRegion(location);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Returns whether the current thread is ticking a region and that the region being ticked
|
|
|
|
+ * owns the chunks centered at the specified world and block position as included in the specified location
|
|
|
|
+ * within the specified square radius.
|
|
|
|
+ * Specifically, this function checks that every chunk with position x in [centerX - radius, centerX + radius] and
|
|
|
|
+ * position z in [centerZ - radius, centerZ + radius] is owned by the current ticking region.
|
|
|
|
+ * @param location Specified location, must have a non-null world.
|
|
|
|
+ * @param squareRadiusChunks Specified square radius. Must be >= 0. Note that this parameter is <i>not</i> a <i>squared</i>
|
|
|
|
+ * radius, but rather a <i>Chebyshev Distance</i>.
|
|
|
|
+ */
|
|
|
|
+ public static boolean isOwnedByCurrentRegion(@NotNull Location location, int squareRadiusChunks) {
|
|
|
|
+ return server.isOwnedByCurrentRegion(location, squareRadiusChunks);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Returns whether the current thread is ticking a region and that the region being ticked
|
|
|
|
+ * owns the chunk at the specified block position.
|
|
|
|
+ * @param block Specified block position.
|
|
|
|
+ */
|
|
|
|
+ public static boolean isOwnedByCurrentRegion(@NotNull org.bukkit.block.Block block) {
|
2023-03-25 18:50:36 +01:00
|
|
|
+ return server.isOwnedByCurrentRegion(block.getLocation());
|
2023-03-07 23:41:00 +01:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Returns whether the current thread is ticking a region and that the region being ticked
|
|
|
|
+ * owns the chunk at the specified world and chunk position.
|
|
|
|
+ * @param world Specified world.
|
|
|
|
+ * @param chunkX Specified x-coordinate of the chunk position.
|
|
|
|
+ * @param chunkZ Specified z-coordinate of the chunk position.
|
|
|
|
+ */
|
|
|
|
+ public static boolean isOwnedByCurrentRegion(@NotNull World world, int chunkX, int chunkZ) {
|
|
|
|
+ return server.isOwnedByCurrentRegion(world, chunkX, chunkZ);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Returns whether the current thread is ticking a region and that the region being ticked
|
|
|
|
+ * owns the chunks centered at the specified world and chunk position within the specified
|
|
|
|
+ * square radius.
|
|
|
|
+ * Specifically, this function checks that every chunk with position x in [centerX - radius, centerX + radius] and
|
|
|
|
+ * position z in [centerZ - radius, centerZ + radius] is owned by the current ticking region.
|
|
|
|
+ * @param world Specified world.
|
|
|
|
+ * @param chunkX Specified x-coordinate of the chunk position.
|
|
|
|
+ * @param chunkZ Specified z-coordinate of the chunk position.
|
|
|
|
+ * @param squareRadiusChunks Specified square radius. Must be >= 0. Note that this parameter is <i>not</i> a <i>squared</i>
|
|
|
|
+ * radius, but rather a <i>Chebyshev Distance</i>.
|
|
|
|
+ */
|
|
|
|
+ public static boolean isOwnedByCurrentRegion(@NotNull World world, int chunkX, int chunkZ, int squareRadiusChunks) {
|
|
|
|
+ return server.isOwnedByCurrentRegion(world, chunkX, chunkZ, squareRadiusChunks);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Returns whether the current thread is ticking a region and that the region being ticked
|
|
|
|
+ * owns the specified entity. Note that this function is the only appropriate method of checking
|
|
|
|
+ * for ownership of an entity, as retrieving the entity's location is undefined unless the entity is owned
|
|
|
|
+ * by the current region.
|
|
|
|
+ * @param entity Specified entity.
|
|
|
|
+ */
|
|
|
|
+ public static boolean isOwnedByCurrentRegion(@NotNull Entity entity) {
|
|
|
|
+ return server.isOwnedByCurrentRegion(entity);
|
|
|
|
+ }
|
|
|
|
// Folia end - region threading API
|
|
|
|
|
|
|
|
@NotNull
|
|
|
|
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
2023-03-25 18:50:36 +01:00
|
|
|
index 5caa00a413450dee18739f6430ffaf5095ea3036..b04742bafbb4045d5842ac96761a941cfd3fc758 100644
|
2023-03-07 23:41:00 +01:00
|
|
|
--- a/src/main/java/org/bukkit/Server.java
|
|
|
|
+++ b/src/main/java/org/bukkit/Server.java
|
2023-03-25 18:50:36 +01:00
|
|
|
@@ -2170,5 +2170,85 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
2023-03-20 00:43:34 +01:00
|
|
|
* @return the global region scheduler
|
2023-03-07 23:41:00 +01:00
|
|
|
*/
|
2023-03-20 00:43:34 +01:00
|
|
|
public @NotNull io.papermc.paper.threadedregions.scheduler.GlobalRegionScheduler getGlobalRegionScheduler();
|
2023-03-07 23:41:00 +01:00
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Returns whether the current thread is ticking a region and that the region being ticked
|
|
|
|
+ * owns the chunk at the specified world and block position.
|
|
|
|
+ * @param world Specified world.
|
|
|
|
+ * @param position Specified block position.
|
|
|
|
+ */
|
2023-03-25 18:50:36 +01:00
|
|
|
+ public boolean isOwnedByCurrentRegion(@NotNull World world, @NotNull io.papermc.paper.math.Position position);
|
2023-03-07 23:41:00 +01:00
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Returns whether the current thread is ticking a region and that the region being ticked
|
|
|
|
+ * owns the chunks centered at the specified block position within the specified square radius.
|
|
|
|
+ * Specifically, this function checks that every chunk with position x in [centerX - radius, centerX + radius] and
|
|
|
|
+ * position z in [centerZ - radius, centerZ + radius] is owned by the current ticking region.
|
|
|
|
+ * @param world Specified world.
|
|
|
|
+ * @param position Specified block position.
|
|
|
|
+ * @param squareRadiusChunks Specified square radius. Must be >= 0. Note that this parameter is <i>not</i> a <i>squared</i>
|
|
|
|
+ * radius, but rather a <i>Chebyshev Distance</i>.
|
|
|
|
+ */
|
2023-03-25 18:50:36 +01:00
|
|
|
+ public boolean isOwnedByCurrentRegion(@NotNull World world, @NotNull io.papermc.paper.math.Position position, int squareRadiusChunks);
|
2023-03-07 23:41:00 +01:00
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Returns whether the current thread is ticking a region and that the region being ticked
|
|
|
|
+ * owns the chunk at the specified world and block position as included in the specified location.
|
|
|
|
+ * @param location Specified location, must have a non-null world.
|
|
|
|
+ */
|
|
|
|
+ public boolean isOwnedByCurrentRegion(@NotNull Location location);
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Returns whether the current thread is ticking a region and that the region being ticked
|
|
|
|
+ * owns the chunks centered at the specified world and block position as included in the specified location
|
|
|
|
+ * within the specified square radius.
|
|
|
|
+ * Specifically, this function checks that every chunk with position x in [centerX - radius, centerX + radius] and
|
|
|
|
+ * position z in [centerZ - radius, centerZ + radius] is owned by the current ticking region.
|
|
|
|
+ * @param location Specified location, must have a non-null world.
|
|
|
|
+ * @param squareRadiusChunks Specified square radius. Must be >= 0. Note that this parameter is <i>not</i> a <i>squared</i>
|
|
|
|
+ * radius, but rather a <i>Chebyshev Distance</i>.
|
|
|
|
+ */
|
|
|
|
+ public boolean isOwnedByCurrentRegion(@NotNull Location location, int squareRadiusChunks);
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Returns whether the current thread is ticking a region and that the region being ticked
|
|
|
|
+ * owns the chunk at the specified block position.
|
|
|
|
+ * @param block Specified block position.
|
|
|
|
+ */
|
2023-03-25 18:50:36 +01:00
|
|
|
+ default boolean isOwnedByCurrentRegion(@NotNull org.bukkit.block.Block block) {
|
|
|
|
+ return isOwnedByCurrentRegion(block.getLocation());
|
|
|
|
+ }
|
2023-03-07 23:41:00 +01:00
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Returns whether the current thread is ticking a region and that the region being ticked
|
|
|
|
+ * owns the chunk at the specified world and chunk position.
|
|
|
|
+ * @param world Specified world.
|
|
|
|
+ * @param chunkX Specified x-coordinate of the chunk position.
|
|
|
|
+ * @param chunkZ Specified z-coordinate of the chunk position.
|
|
|
|
+ */
|
|
|
|
+ public boolean isOwnedByCurrentRegion(@NotNull World world, int chunkX, int chunkZ);
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Returns whether the current thread is ticking a region and that the region being ticked
|
|
|
|
+ * owns the chunks centered at the specified world and chunk position within the specified
|
|
|
|
+ * square radius.
|
|
|
|
+ * Specifically, this function checks that every chunk with position x in [centerX - radius, centerX + radius] and
|
|
|
|
+ * position z in [centerZ - radius, centerZ + radius] is owned by the current ticking region.
|
|
|
|
+ * @param world Specified world.
|
|
|
|
+ * @param chunkX Specified x-coordinate of the chunk position.
|
|
|
|
+ * @param chunkZ Specified z-coordinate of the chunk position.
|
|
|
|
+ * @param squareRadiusChunks Specified square radius. Must be >= 0. Note that this parameter is <i>not</i> a <i>squared</i>
|
|
|
|
+ * radius, but rather a <i>Chebyshev Distance</i>.
|
|
|
|
+ */
|
|
|
|
+ public boolean isOwnedByCurrentRegion(@NotNull World world, int chunkX, int chunkZ, int squareRadiusChunks);
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Returns whether the current thread is ticking a region and that the region being ticked
|
|
|
|
+ * owns the specified entity. Note that this function is the only appropriate method of checking
|
|
|
|
+ * for ownership of an entity, as retrieving the entity's location is undefined unless the entity is owned
|
|
|
|
+ * by the current region.
|
|
|
|
+ * @param entity Specified entity.
|
|
|
|
+ */
|
|
|
|
+ public boolean isOwnedByCurrentRegion(@NotNull Entity entity);
|
|
|
|
// Folia end - region threading API
|
|
|
|
}
|