mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-11 22:48:21 +02:00
117 lines
7.7 KiB
Diff
117 lines
7.7 KiB
Diff
|
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
|
||
|
index 799837c172a5f7856c78e6fe2595c575f3058a5e..e2066c52941d20fe01d3381181c3e5bf2d2ccb9a 100644
|
||
|
--- 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) {
|
||
|
+ // Paper start
|
||
|
+ return clip(raytrace1, blockposition, null);
|
||
|
+ }
|
||
|
+
|
||
|
+ default BlockHitResult clip(ClipContext raytrace1, BlockPos blockposition, java.util.function.Predicate<org.bukkit.block.Block> canCollide) {
|
||
|
+ // Paper end
|
||
|
// 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()));
|
||
|
}
|
||
|
// Paper end
|
||
|
- if (iblockdata.isAir()) return null; // Paper - 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 - optimise air cases and check canCollide predicate
|
||
|
FluidState fluid = iblockdata.getFluidState(); // Paper - don't need to go to world state again
|
||
|
Vec3 vec3d = raytrace1.getFrom();
|
||
|
Vec3 vec3d1 = raytrace1.getTo();
|
||
|
@@ -108,8 +114,14 @@ public interface BlockGetter extends LevelHeightAccessor {
|
||
|
// CraftBukkit end
|
||
|
|
||
|
default BlockHitResult clip(ClipContext context) {
|
||
|
+ // Paper start
|
||
|
+ return clip(context, (java.util.function.Predicate<org.bukkit.block.Block>) null);
|
||
|
+ }
|
||
|
+
|
||
|
+ default BlockHitResult clip(ClipContext context, java.util.function.Predicate<org.bukkit.block.Block> canCollide) {
|
||
|
+ // Paper end
|
||
|
return (BlockHitResult) BlockGetter.traverseBlocks(context.getFrom(), context.getTo(), context, (raytrace1, blockposition) -> {
|
||
|
- return this.clip(raytrace1, blockposition); // CraftBukkit - moved into separate method
|
||
|
+ return this.clip(raytrace1, blockposition, canCollide); // CraftBukkit - moved into separate method // Paper - use method with canCollide predicate
|
||
|
}, (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
|
||
|
index 5e350fa39f47d54f6048ea89c1317759f122b8ae..746f88db6b78b3c8ec372bfaacb26ec98f3b1163 100644
|
||
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||
|
@@ -1118,9 +1118,15 @@ public class CraftWorld extends CraftRegionAccessor implements World {
|
||
|
|
||
|
@Override
|
||
|
public RayTraceResult rayTraceEntities(Location start, Vector direction, double maxDistance, double raySize, Predicate<Entity> filter) {
|
||
|
+ // Paper start
|
||
|
+ return rayTraceEntities((io.papermc.paper.math.Position) start, direction, maxDistance, raySize, filter);
|
||
|
+ }
|
||
|
+
|
||
|
+ public RayTraceResult rayTraceEntities(io.papermc.paper.math.Position start, Vector direction, double maxDistance, double raySize, Predicate<Entity> filter) {
|
||
|
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");
|
||
|
+ // Paper end
|
||
|
|
||
|
Preconditions.checkArgument(direction != null, "Vector direction cannot be null");
|
||
|
direction.checkFinite();
|
||
|
@@ -1170,9 +1176,16 @@ public class CraftWorld extends CraftRegionAccessor implements World {
|
||
|
|
||
|
@Override
|
||
|
public RayTraceResult rayTraceBlocks(Location start, Vector direction, double maxDistance, FluidCollisionMode fluidCollisionMode, boolean ignorePassableBlocks) {
|
||
|
+ // Paper start
|
||
|
+ return this.rayTraceBlocks(start, direction, maxDistance, fluidCollisionMode, ignorePassableBlocks, null);
|
||
|
+ }
|
||
|
+
|
||
|
+ @Override
|
||
|
+ public RayTraceResult rayTraceBlocks(io.papermc.paper.math.Position start, Vector direction, double maxDistance, FluidCollisionMode fluidCollisionMode, boolean ignorePassableBlocks, Predicate<Block> canCollide) {
|
||
|
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");
|
||
|
+ // Paper end
|
||
|
|
||
|
Preconditions.checkArgument(direction != null, "Vector direction cannot be null");
|
||
|
direction.checkFinite();
|
||
|
@@ -1185,16 +1198,23 @@ public class CraftWorld extends CraftRegionAccessor implements World {
|
||
|
}
|
||
|
|
||
|
Vector dir = direction.clone().normalize().multiply(maxDistance);
|
||
|
- Vec3 startPos = CraftLocation.toVec3D(start);
|
||
|
+ Vec3 startPos = io.papermc.paper.util.MCUtil.toVec3(start); // Paper
|
||
|
Vec3 endPos = startPos.add(dir.getX(), dir.getY(), dir.getZ());
|
||
|
- HitResult nmsHitResult = this.getHandle().clip(new ClipContext(startPos, endPos, ignorePassableBlocks ? ClipContext.Block.COLLIDER : ClipContext.Block.OUTLINE, CraftFluidCollisionMode.toNMS(fluidCollisionMode), null));
|
||
|
+ HitResult nmsHitResult = this.getHandle().clip(new ClipContext(startPos, endPos, ignorePassableBlocks ? ClipContext.Block.COLLIDER : ClipContext.Block.OUTLINE, CraftFluidCollisionMode.toNMS(fluidCollisionMode), null), canCollide); // Paper - use method with canCollide predicate
|
||
|
|
||
|
return CraftRayTraceResult.fromNMS(this, nmsHitResult);
|
||
|
}
|
||
|
|
||
|
@Override
|
||
|
public RayTraceResult rayTrace(Location start, Vector direction, double maxDistance, FluidCollisionMode fluidCollisionMode, boolean ignorePassableBlocks, double raySize, Predicate<Entity> filter) {
|
||
|
- RayTraceResult blockHit = this.rayTraceBlocks(start, direction, maxDistance, fluidCollisionMode, ignorePassableBlocks);
|
||
|
+ // Paper start
|
||
|
+ return this.rayTrace(start, direction, maxDistance, fluidCollisionMode, ignorePassableBlocks, raySize, filter, null);
|
||
|
+ }
|
||
|
+
|
||
|
+ @Override
|
||
|
+ public RayTraceResult rayTrace(io.papermc.paper.math.Position start, Vector direction, double maxDistance, FluidCollisionMode fluidCollisionMode, boolean ignorePassableBlocks, double raySize, Predicate<Entity> filter, Predicate<Block> canCollide) {
|
||
|
+ RayTraceResult blockHit = this.rayTraceBlocks(start, direction, maxDistance, fluidCollisionMode, ignorePassableBlocks, canCollide);
|
||
|
+ // Paper end
|
||
|
Vector startVec = null;
|
||
|
double blockHitDistance = maxDistance;
|
||
|
|