fix location.line_of_sight

DenizenScript · Sep 30, 2019 · 4958058 · 4958058
1 parent 2d91588
commit 4958058
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/v1_12/src/main/java/com/denizenscript/denizen/nms/v1_12/helpers/EntityHelperImpl.java b/v1_12/src/main/java/com/denizenscript/denizen/nms/v1_12/helpers/EntityHelperImpl.java
@@ -412,7 +412,11 @@ private static MovingObjectPosition rayTrace(World world, Vector start, Vector e
 
     @Override
     public boolean canTrace(World world, Vector start, Vector end) {
-        return rayTrace(world, start, end) == null;
+        MovingObjectPosition pos = rayTrace(world, start, end);
+        if (pos == null) {
+            return true;
+        }
+        return pos.type == MovingObjectPosition.EnumMovingObjectType.MISS;
     }
 
     @Override

diff --git a/v1_13/src/main/java/com/denizenscript/denizen/nms/v1_13/helpers/EntityHelperImpl.java b/v1_13/src/main/java/com/denizenscript/denizen/nms/v1_13/helpers/EntityHelperImpl.java
@@ -423,7 +423,11 @@ private static MovingObjectPosition rayTrace(World world, Vector start, Vector e
 
     @Override
     public boolean canTrace(World world, Vector start, Vector end) {
-        return rayTrace(world, start, end) == null;
+        MovingObjectPosition pos = rayTrace(world, start, end);
+        if (pos == null) {
+            return true;
+        }
+        return pos.type == MovingObjectPosition.EnumMovingObjectType.MISS;
     }
 
     @Override

diff --git a/v1_14/src/main/java/com/denizenscript/denizen/nms/v1_14/helpers/EntityHelperImpl.java b/v1_14/src/main/java/com/denizenscript/denizen/nms/v1_14/helpers/EntityHelperImpl.java
@@ -457,7 +457,11 @@ private static MovingObjectPosition rayTrace(World world, Vector start, Vector e
 
     @Override
     public boolean canTrace(World world, Vector start, Vector end) {
-        return rayTrace(world, start, end) == null;
+        MovingObjectPosition pos = rayTrace(world, start, end);
+        if (pos == null) {
+            return true;
+        }
+        return pos.getType() == MovingObjectPosition.EnumMovingObjectType.MISS;
     }
 
     @Override