2023-11-04 23:00:51 +01:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: TonytheMacaroni <tonythemacaroni123@gmail.com>
Date: Wed, 6 Sep 2023 19:24:16 -0400
Subject: [PATCH] Add predicate for blocks when raytracing
diff --git a/src/main/java/net/minecraft/world/level/BlockGetter.java b/src/main/java/net/minecraft/world/level/BlockGetter.java
2024-01-16 19:27:39 +01:00
index 7df62a219d0bcffc793c1a8c55b6ed244fdeb199..4b7ea18a34675702c5b17c4819f7977807c1c935 100644
2023-11-04 23:00:51 +01:00
--- a/src/main/java/net/minecraft/world/level/BlockGetter.java
+++ b/src/main/java/net/minecraft/world/level/BlockGetter.java
@@ -83,6 +83,12 @@ public interface BlockGetter extends LevelHeightAccessor {
// CraftBukkit start - moved block handling into separate method for use by Block#rayTrace
default BlockHitResult clip(ClipContext raytrace1, BlockPos blockposition) {
2024-01-13 18:34:33 +01:00
+ // Paper start - Add predicate for blocks when raytracing
2023-11-04 23:00:51 +01:00
+ return clip(raytrace1, blockposition, null);
+ }
+
2023-11-25 23:34:42 +01:00
+ default BlockHitResult clip(ClipContext raytrace1, BlockPos blockposition, java.util.function.Predicate<? super org.bukkit.block.Block> canCollide) {
2024-01-13 18:34:33 +01:00
+ // Paper end - Add predicate for blocks when raytracing
2023-11-04 23:00:51 +01:00
// Paper start - Prevent raytrace from loading chunks
BlockState iblockdata = this.getBlockStateIfLoaded(blockposition);
if (iblockdata == null) {
@@ -92,7 +98,7 @@ public interface BlockGetter extends LevelHeightAccessor {
return BlockHitResult.miss(raytrace1.getTo(), Direction.getNearest(vec3d.x, vec3d.y, vec3d.z), BlockPos.containing(raytrace1.getTo()));
}
2024-01-16 19:27:39 +01:00
// Paper end - Prevent raytrace from loading chunks
- if (iblockdata.isAir()) return null; // Paper - Perf: optimise air cases
+ if (iblockdata.isAir() || (canCollide != null && this instanceof LevelAccessor levelAccessor && !canCollide.test(org.bukkit.craftbukkit.block.CraftBlock.at(levelAccessor, blockposition)))) return null; // Paper - Perf: optimise air cases &g check canCollide predicate
FluidState fluid = iblockdata.getFluidState(); // Paper - Perf: don't need to go to world state again
2023-11-04 23:00:51 +01:00
Vec3 vec3d = raytrace1.getFrom();
Vec3 vec3d1 = raytrace1.getTo();
@@ -108,8 +114,14 @@ public interface BlockGetter extends LevelHeightAccessor {
// CraftBukkit end
default BlockHitResult clip(ClipContext context) {
2024-01-13 18:34:33 +01:00
+ // Paper start - Add predicate for blocks when raytracing
2023-11-04 23:00:51 +01:00
+ return clip(context, (java.util.function.Predicate<org.bukkit.block.Block>) null);
+ }
+
2023-11-25 23:34:42 +01:00
+ default BlockHitResult clip(ClipContext context, java.util.function.Predicate<? super org.bukkit.block.Block> canCollide) {
2024-01-13 18:34:33 +01:00
+ // Paper end - Add predicate for blocks when raytracing
2023-11-04 23:00:51 +01:00
return (BlockHitResult) BlockGetter.traverseBlocks(context.getFrom(), context.getTo(), context, (raytrace1, blockposition) -> {
- return this.clip(raytrace1, blockposition); // CraftBukkit - moved into separate method
2024-01-13 18:34:33 +01:00
+ return this.clip(raytrace1, blockposition, canCollide); // CraftBukkit - moved into separate method // Paper - Add predicate for blocks when raytracing
2023-11-04 23:00:51 +01:00
}, (raytrace1) -> {
Vec3 vec3d = raytrace1.getFrom().subtract(raytrace1.getTo());
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
2024-01-21 19:37:09 +01:00
index 55330b6b5e52f67d7490a2932a0ac7ec0387f145..1843ae08cc19cb8f7290403f8622dcd760e9399f 100644
2023-11-04 23:00:51 +01:00
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
2023-12-25 23:51:56 +01:00
@@ -1125,9 +1125,15 @@ public class CraftWorld extends CraftRegionAccessor implements World {
2023-11-04 23:00:51 +01:00
@Override
2023-11-25 23:34:42 +01:00
public RayTraceResult rayTraceEntities(Location start, Vector direction, double maxDistance, double raySize, Predicate<? super Entity> filter) {
2024-01-13 18:34:33 +01:00
+ // Paper start - Add predicate for blocks when raytracing
2023-11-04 23:00:51 +01:00
+ return rayTraceEntities((io.papermc.paper.math.Position) start, direction, maxDistance, raySize, filter);
+ }
+
2023-11-25 23:34:42 +01:00
+ public RayTraceResult rayTraceEntities(io.papermc.paper.math.Position start, Vector direction, double maxDistance, double raySize, Predicate<? super Entity> filter) {
2023-11-04 23:00:51 +01:00
Preconditions.checkArgument(start != null, "Location start cannot be null");
- Preconditions.checkArgument(this.equals(start.getWorld()), "Location start cannot be in a different world");
- start.checkFinite();
+ Preconditions.checkArgument(!(start instanceof Location location) || this.equals(location.getWorld()), "Location start cannot be in a different world");
+ Preconditions.checkArgument(start.isFinite(), "Location start is not finite");
2024-01-13 18:34:33 +01:00
+ // Paper end - Add predicate for blocks when raytracing
2023-11-04 23:00:51 +01:00
Preconditions.checkArgument(direction != null, "Vector direction cannot be null");
direction.checkFinite();
2023-12-25 23:51:56 +01:00
@@ -1177,9 +1183,16 @@ public class CraftWorld extends CraftRegionAccessor implements World {
2023-11-04 23:00:51 +01:00
@Override
public RayTraceResult rayTraceBlocks(Location start, Vector direction, double maxDistance, FluidCollisionMode fluidCollisionMode, boolean ignorePassableBlocks) {
2024-01-13 18:34:33 +01:00
+ // Paper start - Add predicate for blocks when raytracing
2023-11-04 23:00:51 +01:00
+ return this.rayTraceBlocks(start, direction, maxDistance, fluidCollisionMode, ignorePassableBlocks, null);
+ }
+
+ @Override
2023-11-25 23:34:42 +01:00
+ public RayTraceResult rayTraceBlocks(io.papermc.paper.math.Position start, Vector direction, double maxDistance, FluidCollisionMode fluidCollisionMode, boolean ignorePassableBlocks, Predicate<? super Block> canCollide) {
2023-11-04 23:00:51 +01:00
Preconditions.checkArgument(start != null, "Location start cannot be null");
- Preconditions.checkArgument(this.equals(start.getWorld()), "Location start cannot be in a different world");
- start.checkFinite();
+ Preconditions.checkArgument(!(start instanceof Location location) || this.equals(location.getWorld()), "Location start cannot be in a different world");
+ Preconditions.checkArgument(start.isFinite(), "Location start is not finite");
2024-01-13 18:34:33 +01:00
+ // Paper end - Add predicate for blocks when raytracing
2023-11-04 23:00:51 +01:00
Preconditions.checkArgument(direction != null, "Vector direction cannot be null");
direction.checkFinite();
2023-12-25 23:51:56 +01:00
@@ -1192,16 +1205,23 @@ public class CraftWorld extends CraftRegionAccessor implements World {
2023-11-04 23:00:51 +01:00
}
Vector dir = direction.clone().normalize().multiply(maxDistance);
- Vec3 startPos = CraftLocation.toVec3D(start);
2024-01-13 18:34:33 +01:00
+ Vec3 startPos = io.papermc.paper.util.MCUtil.toVec3(start); // Paper - Add predicate for blocks when raytracing
2023-11-04 23:00:51 +01:00
Vec3 endPos = startPos.add(dir.getX(), dir.getY(), dir.getZ());
2023-12-06 19:18:53 +01:00
- HitResult nmsHitResult = this.getHandle().clip(new ClipContext(startPos, endPos, ignorePassableBlocks ? ClipContext.Block.COLLIDER : ClipContext.Block.OUTLINE, CraftFluidCollisionMode.toNMS(fluidCollisionMode), CollisionContext.empty()));
2024-01-13 18:34:33 +01:00
+ HitResult nmsHitResult = this.getHandle().clip(new ClipContext(startPos, endPos, ignorePassableBlocks ? ClipContext.Block.COLLIDER : ClipContext.Block.OUTLINE, CraftFluidCollisionMode.toNMS(fluidCollisionMode), CollisionContext.empty()), canCollide); // Paper - Add predicate for blocks when raytracing
2023-11-04 23:00:51 +01:00
return CraftRayTraceResult.fromNMS(this, nmsHitResult);
}
@Override
2023-11-25 23:34:42 +01:00
public RayTraceResult rayTrace(Location start, Vector direction, double maxDistance, FluidCollisionMode fluidCollisionMode, boolean ignorePassableBlocks, double raySize, Predicate<? super Entity> filter) {
2023-11-04 23:00:51 +01:00
- RayTraceResult blockHit = this.rayTraceBlocks(start, direction, maxDistance, fluidCollisionMode, ignorePassableBlocks);
2024-01-13 18:34:33 +01:00
+ // Paper start - Add predicate for blocks when raytracing
2023-11-04 23:00:51 +01:00
+ return this.rayTrace(start, direction, maxDistance, fluidCollisionMode, ignorePassableBlocks, raySize, filter, null);
+ }
+
+ @Override
2023-11-25 23:34:42 +01:00
+ public RayTraceResult rayTrace(io.papermc.paper.math.Position start, Vector direction, double maxDistance, FluidCollisionMode fluidCollisionMode, boolean ignorePassableBlocks, double raySize, Predicate<? super Entity> filter, Predicate<? super Block> canCollide) {
2023-11-04 23:00:51 +01:00
+ RayTraceResult blockHit = this.rayTraceBlocks(start, direction, maxDistance, fluidCollisionMode, ignorePassableBlocks, canCollide);
2024-01-13 18:34:33 +01:00
+ // Paper end - Add predicate for blocks when raytracing
2023-11-04 23:00:51 +01:00
Vector startVec = null;
double blockHitDistance = maxDistance;