aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0859-Collision-API.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0859-Collision-API.patch')
-rw-r--r--patches/server/0859-Collision-API.patch47
1 files changed, 47 insertions, 0 deletions
diff --git a/patches/server/0859-Collision-API.patch b/patches/server/0859-Collision-API.patch
new file mode 100644
index 0000000000..38fea82179
--- /dev/null
+++ b/patches/server/0859-Collision-API.patch
@@ -0,0 +1,47 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Owen1212055 <[email protected]>
+Date: Wed, 6 Oct 2021 20:10:44 -0400
+Subject: [PATCH] Collision API
+
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
+index 5bab5c75a2ce945b43434d2240c9d1124a20aee2..94f21c6acaee5a632b6adb4e77488bb2e385fbea 100644
+--- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
++++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
+@@ -1019,5 +1019,12 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
+
+ return this.getHandle().clip(new net.minecraft.world.level.ClipContext(vec3d, vec3d1, net.minecraft.world.level.ClipContext.Block.COLLIDER, net.minecraft.world.level.ClipContext.Fluid.NONE, null)).getType() == net.minecraft.world.phys.HitResult.Type.MISS;
+ }
++
++ @Override
++ public boolean hasCollisionsIn(@org.jetbrains.annotations.NotNull org.bukkit.util.BoundingBox boundingBox) {
++ net.minecraft.world.phys.AABB aabb = new AABB(boundingBox.getMinX(), boundingBox.getMinY(), boundingBox.getMinZ(), boundingBox.getMaxX(), boundingBox.getMaxY(), boundingBox.getMaxZ(), false);
++
++ return !this.getHandle().noCollision(aabb);
++ }
+ // Paper end
+ }
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+index 14b97388b89978b1c0997beeebd7c85102c84a2f..e05c3c15d15c242e07caa9033cc49d515dfcdb41 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+@@ -1415,4 +1415,19 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+ return getHandle().isInPowderSnow || getHandle().wasInPowderSnow; // depending on the location in the entity "tick" either could be needed.
+ }
+ // Paper end
++ // Paper Start - Collision API
++ @Override
++ public boolean collidesAt(@org.jetbrains.annotations.NotNull Location location) {
++ net.minecraft.world.phys.AABB aabb = this.getHandle().getBoundingBoxAt(location.getX(), location.getY(), location.getZ());
++
++ return !this.getHandle().level().noCollision(this.getHandle(), aabb);
++ }
++
++ @Override
++ public boolean wouldCollideUsing(@org.jetbrains.annotations.NotNull BoundingBox boundingBox) {
++ net.minecraft.world.phys.AABB aabb = new AABB(boundingBox.getMinX(), boundingBox.getMinY(), boundingBox.getMinZ(), boundingBox.getMaxX(), boundingBox.getMaxY(), boundingBox.getMaxZ(), false);
++
++ return !this.getHandle().level().noCollision(this.getHandle(), aabb);
++ }
++ // Paper End - Collision API
+ }