From fde7591ce1a3626a4b18afcd5494788eb0e4918c Mon Sep 17 00:00:00 2001 From: Samsuik Date: Mon, 2 Dec 2024 21:10:47 +0000 Subject: [PATCH] Fix raytrace during entity movement loading chunks --- ...0078-Allow-projectiles-to-load-chunks-for-collisions.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/server/0078-Allow-projectiles-to-load-chunks-for-collisions.patch b/patches/server/0078-Allow-projectiles-to-load-chunks-for-collisions.patch index 40b8953..7dec15e 100644 --- a/patches/server/0078-Allow-projectiles-to-load-chunks-for-collisions.patch +++ b/patches/server/0078-Allow-projectiles-to-load-chunks-for-collisions.patch @@ -37,7 +37,7 @@ index d1eefa6ef3e9abfe7af4d8310aa64465fa2d5463..04d45b2ddc3489c4d0764da1575cb9a3 // copied the last function parameter (listed below) Vec3 vec3d = raytrace1.getFrom().subtract(raytrace1.getTo()); diff --git a/src/main/java/net/minecraft/world/level/ClipContext.java b/src/main/java/net/minecraft/world/level/ClipContext.java -index ad2c533e9a0f0e2d97620b0e16200d7eeaedeefb..1e351f85dd1d9c4f267b283dd93bb74306fd9311 100644 +index ad2c533e9a0f0e2d97620b0e16200d7eeaedeefb..b8c68b2cf534a39414474e06161d575dbd666865 100644 --- a/src/main/java/net/minecraft/world/level/ClipContext.java +++ b/src/main/java/net/minecraft/world/level/ClipContext.java @@ -20,6 +20,13 @@ public class ClipContext { @@ -58,7 +58,7 @@ index ad2c533e9a0f0e2d97620b0e16200d7eeaedeefb..1e351f85dd1d9c4f267b283dd93bb743 this.block = shapeType; this.fluid = fluidHandling; this.collisionContext = (entity == null) ? CollisionContext.empty() : CollisionContext.of(entity); // CraftBukkit -+ this.loadChunks = entity != null && entity.loadChunks; // Sakura - allow projectiles to load chunks for collisions ++ this.loadChunks = entity instanceof net.minecraft.world.entity.projectile.Projectile && entity.loadChunks; // Sakura - allow projectiles to load chunks for collisions } public Vec3 getTo() {