2022-07-31 17:30:34 +02: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
|
2023-12-05 18:33:18 +01:00
|
|
|
index 44ee56a5956cc17194c767a0c1071a2abffe818a..43dd6c59cceba12f27e6b265acc3ad97eea37abd 100644
|
2022-07-31 17:30:34 +02:00
|
|
|
--- a/src/main/java/org/bukkit/RegionAccessor.java
|
|
|
|
+++ b/src/main/java/org/bukkit/RegionAccessor.java
|
2023-12-05 18:33:18 +01:00
|
|
|
@@ -493,5 +493,15 @@ public interface RegionAccessor extends Keyed { // Paper
|
2022-07-31 17:30:34 +02:00
|
|
|
* @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
|
Updated Upstream (Bukkit/CraftBukkit) (#10242)
* Updated Upstream (Bukkit/CraftBukkit)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
Bukkit Changes:
a6a9d2a4 Remove some old ApiStatus.Experimental annotations
be72314c SPIGOT-7300, PR-829: Add new DamageSource API providing enhanced information about entity damage
b252cf05 SPIGOT-7576, PR-970: Add methods in MushroomCow to change stew effects
b1c689bd PR-902: Add Server#isLoggingIPs to get log-ips configuration
08f86d1c PR-971: Add Player methods for client-side potion effects
2e3024a9 PR-963: Add API for in-world structures
a23292a7 SPIGOT-7530, PR-948: Improve Resource Pack API with new 1.20.3 functionality
1851857b SPIGOT-3071, PR-969: Add entity spawn method with spawn reason
cde4c52a SPIGOT-5553, PR-964: Add EntityKnockbackEvent
CraftBukkit Changes:
38fd4bd50 Fix accidentally renamed internal damage method
80f0ce4be SPIGOT-7300, PR-1180: Add new DamageSource API providing enhanced information about entity damage
7e43f3b16 SPIGOT-7581: Fix typo in BlockMushroom
ea14b7d90 SPIGOT-7576, PR-1347: Add methods in MushroomCow to change stew effects
4c687f243 PR-1259: Add Server#isLoggingIPs to get log-ips configuration
22a541a29 Improve support for per-world game rules
cb7dccce2 PR-1348: Add Player methods for client-side potion effects
b8d6109f0 PR-1335: Add API for in-world structures
4398a1b5b SPIGOT-7577: Make CraftWindCharge#explode discard the entity
e74107678 Fix Crafter maximum stack size
0bb0f4f6a SPIGOT-7530, PR-1314: Improve Resource Pack API with new 1.20.3 functionality
4949f556d SPIGOT-3071, PR-1345: Add entity spawn method with spawn reason
20ac73ca2 PR-1353: Fix Structure#place not working as documented with 0 palette
3c1b77871 SPIGOT-6911, PR-1349: Change max book length in CraftMetaBook
333701839 SPIGOT-7572: Bee nests generated without bees
f48f4174c SPIGOT-5553, PR-1336: Add EntityKnockbackEvent
2024-02-11 22:28:00 +01:00
|
|
|
index 3905c12b23bbfc88c9667b04e60fad7ad2febd60..3fec6816bcc9167314b021a9989409649da6f7a7 100644
|
2022-07-31 17:30:34 +02:00
|
|
|
--- a/src/main/java/org/bukkit/entity/Entity.java
|
|
|
|
+++ b/src/main/java/org/bukkit/entity/Entity.java
|
Updated Upstream (Bukkit/CraftBukkit) (#10242)
* Updated Upstream (Bukkit/CraftBukkit)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
Bukkit Changes:
a6a9d2a4 Remove some old ApiStatus.Experimental annotations
be72314c SPIGOT-7300, PR-829: Add new DamageSource API providing enhanced information about entity damage
b252cf05 SPIGOT-7576, PR-970: Add methods in MushroomCow to change stew effects
b1c689bd PR-902: Add Server#isLoggingIPs to get log-ips configuration
08f86d1c PR-971: Add Player methods for client-side potion effects
2e3024a9 PR-963: Add API for in-world structures
a23292a7 SPIGOT-7530, PR-948: Improve Resource Pack API with new 1.20.3 functionality
1851857b SPIGOT-3071, PR-969: Add entity spawn method with spawn reason
cde4c52a SPIGOT-5553, PR-964: Add EntityKnockbackEvent
CraftBukkit Changes:
38fd4bd50 Fix accidentally renamed internal damage method
80f0ce4be SPIGOT-7300, PR-1180: Add new DamageSource API providing enhanced information about entity damage
7e43f3b16 SPIGOT-7581: Fix typo in BlockMushroom
ea14b7d90 SPIGOT-7576, PR-1347: Add methods in MushroomCow to change stew effects
4c687f243 PR-1259: Add Server#isLoggingIPs to get log-ips configuration
22a541a29 Improve support for per-world game rules
cb7dccce2 PR-1348: Add Player methods for client-side potion effects
b8d6109f0 PR-1335: Add API for in-world structures
4398a1b5b SPIGOT-7577: Make CraftWindCharge#explode discard the entity
e74107678 Fix Crafter maximum stack size
0bb0f4f6a SPIGOT-7530, PR-1314: Improve Resource Pack API with new 1.20.3 functionality
4949f556d SPIGOT-3071, PR-1345: Add entity spawn method with spawn reason
20ac73ca2 PR-1353: Fix Structure#place not working as documented with 0 palette
3c1b77871 SPIGOT-6911, PR-1349: Change max book length in CraftMetaBook
333701839 SPIGOT-7572: Bee nests generated without bees
f48f4174c SPIGOT-5553, PR-1336: Add EntityKnockbackEvent
2024-02-11 22:28:00 +01:00
|
|
|
@@ -966,4 +966,26 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
|
2022-07-31 17:30:34 +02:00
|
|
|
*/
|
|
|
|
boolean isInPowderedSnow();
|
|
|
|
// Paper end
|
|
|
|
+
|
2024-01-19 22:13:42 +01:00
|
|
|
+ // Paper start - Collision API
|
2022-07-31 17:30:34 +02:00
|
|
|
+ /**
|
|
|
|
+ * 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);
|
2024-01-19 22:13:42 +01:00
|
|
|
+ // Paper end - Collision API
|
2022-07-31 17:30:34 +02:00
|
|
|
}
|