aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/api/0405-Folia-scheduler-and-owned-region-API.patch
diff options
context:
space:
mode:
authorJake Potrebic <[email protected]>2024-06-03 10:20:43 -0700
committerGitHub <[email protected]>2024-06-03 10:20:43 -0700
commit54fbd0cf0cdc9c2356a108ce5b51ea93e95fa3ac (patch)
tree34e0bf57691a76308366382d3b461fccdcb80c7d /patches/api/0405-Folia-scheduler-and-owned-region-API.patch
parentac647513b2330e4c58f7c511ed79b1ad5d262be6 (diff)
downloadPaper-54fbd0cf0cdc9c2356a108ce5b51ea93e95fa3ac.tar.gz
Paper-54fbd0cf0cdc9c2356a108ce5b51ea93e95fa3ac.zip
clarify what getEntityId actually returns (#10839)
Diffstat (limited to 'patches/api/0405-Folia-scheduler-and-owned-region-API.patch')
-rw-r--r--patches/api/0405-Folia-scheduler-and-owned-region-API.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/api/0405-Folia-scheduler-and-owned-region-API.patch b/patches/api/0405-Folia-scheduler-and-owned-region-API.patch
index f54ce03a49..7732b4c696 100644
--- a/patches/api/0405-Folia-scheduler-and-owned-region-API.patch
+++ b/patches/api/0405-Folia-scheduler-and-owned-region-API.patch
@@ -769,10 +769,10 @@ index e9a97ee5c086ebb48ebc3d9bca406f32380d28cb..871696b6c7363efc7020f4ac7f6b7437
+ // Paper end - Folia region threading API
}
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 9e7b6ed599759de451429c99bc6876b878c1cca2..9a0022f9e77b7e532c0cad9f85620901064e436d 100644
+index a76e537c9b3b9519cd46894c90b750f012182be9..4580c7613fac4f1eeccc2be2d15497cec5868736 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -1097,4 +1097,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -1101,4 +1101,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
*/
boolean wouldCollideUsing(@NotNull BoundingBox boundingBox);
// Paper end - Collision API