c0936a71bd
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: 01aa02eb PR-858: Add LivingEntity#playHurtAnimation() 9421320f PR-884: Refinements to new ban API for improved compatibility and correctness 37a60b45 SPIGOT-6455, SPIGOT-7030, PR-750: Improve ban API 4eeb174b All smithing inventories are now the new smithing inventory f2bb168e PR-880: Add methods to get/set FallingBlock CancelDrop e7a807fa PR-879: Add Player#sendHealthUpdate() 692b8e96 SPIGOT-7370: Remove float value conversion in plugin.yml 2d033390 SPIGOT-7403: Add direct API for waxed signs 16a08373 PR-876: Add missing Raider API and 'no action ticks' CraftBukkit Changes: b60a95c8c PR-1189: Add LivingEntity#playHurtAnimation() 95c335c63 PR-1226: Fix VehicleEnterEvent not being called for certain entities 0a0fc3bee PR-1227: Refinements to new ban API for improved compatibility and correctness 0d0b1e5dc Revert bad change to PathfinderGoalSit causing all cats to sit 648196070 SPIGOT-6455, SPIGOT-7030, PR-1054: Improve ban API 31fe848d6 All smithing inventories are now the new smithing inventory 9a919a143 SPIGOT-7416: SmithItemEvent not firing in Smithing Table 9f64f0d22 PR-1221: Add methods to get/set FallingBlock CancelDrop 3be9ac171 PR-1220: Add Player#sendHealthUpdate() c1279f775 PR-1209: Clean up various patches c432e4397 Fix Raider#setCelebrating() implementation 504d96665 SPIGOT-7403: Add direct API for waxed signs c68c1f1b3 PR-1216: Add missing Raider API and 'no action ticks' 85b89c3dd Increase outdated build delay Spigot Changes: 9ebce8af Rebuild patches 64b565e6 Rebuild patches
57 lines
2.6 KiB
Diff
57 lines
2.6 KiB
Diff
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 8f50eb9b902236f5e039f5d26f3ca9a044b01a75..0d9184abd7090a5123a990f76847ee9b8971f735 100644
|
|
--- a/src/main/java/org/bukkit/RegionAccessor.java
|
|
+++ b/src/main/java/org/bukkit/RegionAccessor.java
|
|
@@ -469,5 +469,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
|
|
index 97f0bc6573c8ba09de77061b6312b91cd713221d..3f3ea5bb6b3ea6f55b5cd699f1c01ac159619add 100644
|
|
--- a/src/main/java/org/bukkit/entity/Entity.java
|
|
+++ b/src/main/java/org/bukkit/entity/Entity.java
|
|
@@ -913,4 +913,26 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
|
|
*/
|
|
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
|
|
}
|