mirror of https://github.com/PaperMC/Paper.git
49 lines
2.7 KiB
Diff
49 lines
2.7 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: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 d1c265733941874002f6dfc7543917af88600659..72c275d7da798ee10a224bbd3f4c92abd82601e1 100644
|
||
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
|
||
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
|
||
|
@@ -539,5 +539,12 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
|
||
|
|
|
||
|
|
return this.getHandle().clip(new net.minecraft.world.level.ClipContext(start, end, net.minecraft.world.level.ClipContext.Block.COLLIDER, net.minecraft.world.level.ClipContext.Fluid.NONE, net.minecraft.world.phys.shapes.CollisionContext.empty())).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 net.minecraft.world.phys.AABB(boundingBox.getMinX(), boundingBox.getMinY(), boundingBox.getMinZ(), boundingBox.getMaxX(), boundingBox.getMaxY(), boundingBox.getMaxZ());
|
||
|
|
+
|
||
|
|
+ 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 b6fef2ca5b564c293cb602cb8e300d35dba89b1f..92c80776273f6be43b40686c7ab7dd7371b1c06f 100644
|
||
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
||
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
||
|
|
@@ -1174,4 +1174,20 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
|
||
|
return this.getHandle().noPhysics;
|
||
|
|
}
|
||
|
|
// Paper end - missing entity api
|
||
|
+
|
||
|
|
+ // 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());
|
||
|
|
+
|
||
|
|
+ return !this.getHandle().level().noCollision(this.getHandle(), aabb);
|
||
|
|
+ }
|
||
|
|
+ // Paper end - Collision API
|
||
|
|
}
|