2022-07-31 15:30:34 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
|
|
|
|
Date: Wed, 6 Oct 2021 20:10:36 -0400
|
|
|
|
Subject: [PATCH] Collision API
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/RegionAccessor.java b/src/main/java/org/bukkit/RegionAccessor.java
|
|
|
|
index 3f7e860de4e28745fcdf8d2f41f4a8c210f48909..39fa4c65e0f61450901662ff5c08d54a5d9841b2 100644
|
|
|
|
--- a/src/main/java/org/bukkit/RegionAccessor.java
|
|
|
|
+++ b/src/main/java/org/bukkit/RegionAccessor.java
|
|
|
|
@@ -424,5 +424,15 @@ public interface RegionAccessor extends Keyed { // Paper
|
|
|
|
* @return whether a line of sight exists between {@code from} and {@code to}
|
|
|
|
*/
|
|
|
|
public boolean lineOfSightExists(@NotNull Location from, @NotNull Location to);
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Checks if the world collides with the given boundingbox.
|
|
|
|
+ * This will check for any colliding hard entities (boats, shulkers) / worldborder / blocks.
|
|
|
|
+ * Does not load chunks that are within the bounding box.
|
|
|
|
+ *
|
|
|
|
+ * @param boundingBox the box to check collisions in
|
|
|
|
+ * @return collides or not
|
|
|
|
+ */
|
|
|
|
+ boolean hasCollisionsIn(@NotNull org.bukkit.util.BoundingBox boundingBox);
|
|
|
|
// Paper end
|
|
|
|
}
|
|
|
|
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
|
2022-10-11 12:43:10 +00:00
|
|
|
index 9bfe62185acb2a208268a2db3aa81dad9e0eed5e..33a6b7a27dc91552799c07a7aad9b3df31ad13f7 100644
|
2022-07-31 15:30:34 +00:00
|
|
|
--- a/src/main/java/org/bukkit/entity/Entity.java
|
|
|
|
+++ b/src/main/java/org/bukkit/entity/Entity.java
|
2022-10-11 12:43:10 +00:00
|
|
|
@@ -929,4 +929,26 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
|
2022-07-31 15:30:34 +00:00
|
|
|
*/
|
|
|
|
boolean isInPowderedSnow();
|
|
|
|
// Paper end
|
|
|
|
+
|
|
|
|
+ // Paper Start - Collision API
|
|
|
|
+ /**
|
|
|
|
+ * Checks for any collisions with the entity's bounding box at the provided location.
|
|
|
|
+ * This will check for any colliding entities (boats, shulkers) / worldborder / blocks.
|
|
|
|
+ * Does not load chunks that are within the bounding box at the specified location.
|
|
|
|
+ *
|
|
|
|
+ * @param location the location to check collisions in
|
|
|
|
+ * @return collides or not
|
|
|
|
+ */
|
|
|
|
+ boolean collidesAt(@NotNull Location location);
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * This checks using the given boundingbox as the entity's boundingbox if the entity would collide with anything.
|
|
|
|
+ * This will check for any colliding entities (boats, shulkers) / worldborder / blocks.
|
|
|
|
+ * Does not load chunks that are within the bounding box.
|
|
|
|
+ *
|
|
|
|
+ * @param boundingBox the box to check collisions in
|
|
|
|
+ * @return collides or not
|
|
|
|
+ */
|
|
|
|
+ boolean wouldCollideUsing(@NotNull BoundingBox boundingBox);
|
|
|
|
+ // Paper End - Collision API
|
|
|
|
}
|