revert to old raytrace method

PhantazmNetwork · Jul 14, 2023 · 6891b50 · 6891b50
1 parent 06fe5cc
commit 6891b50
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/...java/org/phantazm/zombies/equipment/perk/equipment/interactor/MeleeInteractorCreator.java b/...java/org/phantazm/zombies/equipment/perk/equipment/interactor/MeleeInteractorCreator.java
@@ -7,6 +7,7 @@
 import com.github.steanky.element.core.annotation.document.Description;
 import com.github.steanky.toolkit.collection.Wrapper;
 import net.minestom.server.collision.BoundingBox;
+import net.minestom.server.collision.CollisionUtils;
 import net.minestom.server.coordinate.Point;
 import net.minestom.server.coordinate.Pos;
 import net.minestom.server.coordinate.Vec;
@@ -88,12 +89,14 @@ public boolean leftClick() {
                         .raytraceCandidates(eyePos, targetPos, EntityTracker.Target.LIVING_ENTITIES, hit -> {
                             if (mobStore.hasMob(hit.getUuid())) {
                                 BoundingBox boundingBox = hit.getBoundingBox();
+                                Pos hitPosition = hit.getPosition();
 
-                                RayUtils.rayTrace(boundingBox, hit.getPosition(), eyePos).ifPresent(vec -> {
+                                RayUtils.rayTrace(boundingBox, hitPosition, eyePos).ifPresent(vec -> {
                                     HitResult closestHit = closest.get();
                                     if ((closestHit == null ||
                                             vec.distanceSquared(eyePos) < closestHit.pos.distanceSquared(eyePos)) &&
-                                            player.hasLineOfSight(hit)) {
+                                            CollisionUtils.isLineOfSightReachingShape(instance, player.getChunk(),
+                                                    eyePos, hitPosition, boundingBox)) {
                                         closest.set(new HitResult(hit, vec));
                                     }
                                 });