From e64016738af89d577e61c86ae1d0c44c7dff1c70 Mon Sep 17 00:00:00 2001 From: Samsuik Date: Sun, 21 Jan 2024 23:32:03 +0000 Subject: [PATCH] Fix wrong raytrace method used in getSeenPercent --- patches/server/0040-Configure-cannon-physics-by-version.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/server/0040-Configure-cannon-physics-by-version.patch b/patches/server/0040-Configure-cannon-physics-by-version.patch index 27d7c7e..a13c0cb 100644 --- a/patches/server/0040-Configure-cannon-physics-by-version.patch +++ b/patches/server/0040-Configure-cannon-physics-by-version.patch @@ -455,7 +455,7 @@ index 8ee03ac1c824fd2476339202c073239292ef62a2..5e588332f5916355293553012c73a647 // Paper end } diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java -index 5a10afb92fd62f433be9be6751e5222f3666c9f3..9fe64b720b9ca112be86468f06dbe88595e64b30 100644 +index 5a10afb92fd62f433be9be6751e5222f3666c9f3..560893581a2547082ab71def32d7ae089d73c261 100644 --- a/src/main/java/net/minecraft/world/level/Explosion.java +++ b/src/main/java/net/minecraft/world/level/Explosion.java @@ -74,6 +74,7 @@ public class Explosion { @@ -484,7 +484,7 @@ index 5a10afb92fd62f433be9be6751e5222f3666c9f3..9fe64b720b9ca112be86468f06dbe885 - } else if (entity.level().clip(new ClipContext(vec3d1, source, ClipContext.Block.COLLIDER, ClipContext.Fluid.NONE, entity)).getType() == HitResult.Type.MISS) { + hitResult = data.density() == 1.0 ? net.minecraft.world.phys.HitResult.Type.MISS : net.minecraft.world.phys.HitResult.Type.BLOCK; + } else { -+ if (entity.physics().afterOrEqual(1_14_0)) { ++ if (entity.physics().before(1_14_0)) { + hitResult = entity.level().rayTrace(vec3d1, source); + } else { + hitResult = entity.level().clip(new ClipContext(vec3d1, source, entity.physics().afterOrEqual(1_16_0) ? ClipContext.Block.COLLIDER : ClipContext.Block.OUTLINE, ClipContext.Fluid.NONE, entity)).getType();