2022-07-31 15:30:34 +00: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: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
|
2023-09-10 02:28:03 +00:00
|
|
|
index 5be114bc70c6fdbcb7d804e7558a5172c4461b96..3b9d7f92f4e47da2d7eb1e9cb9e996ee36b57e4c 100644
|
2022-07-31 15:30:34 +00:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
|
2023-09-10 02:28:03 +00:00
|
|
|
@@ -1020,5 +1020,12 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
|
2022-07-31 15:30:34 +00:00
|
|
|
|
2023-09-10 02:28:03 +00:00
|
|
|
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, null)).getType() == net.minecraft.world.phys.HitResult.Type.MISS;
|
2022-07-31 15:30:34 +00:00
|
|
|
}
|
|
|
|
+
|
|
|
|
+ @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
|
2023-08-13 23:32:51 +00:00
|
|
|
index df554fa92065bc4c8566a9638f4f6f6ca9ba54db..bc0a46a6f2ae24b40d3997074c9084cdbb595602 100644
|
2022-07-31 15:30:34 +00:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
2023-08-13 23:32:51 +00:00
|
|
|
@@ -1419,4 +1419,19 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
|
2022-07-31 15:30:34 +00:00
|
|
|
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());
|
|
|
|
+
|
2023-06-08 19:35:20 +00:00
|
|
|
+ return !this.getHandle().level().noCollision(this.getHandle(), aabb);
|
2022-07-31 15:30:34 +00:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @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);
|
|
|
|
+
|
2023-06-08 19:35:20 +00:00
|
|
|
+ return !this.getHandle().level().noCollision(this.getHandle(), aabb);
|
2022-07-31 15:30:34 +00:00
|
|
|
+ }
|
|
|
|
+ // Paper End - Collision API
|
|
|
|
}
|