cleanup ray trace and some meta

DenizenScript · Nov 12, 2020 · 08f563a · 08f563a
1 parent 4327ad7
commit 08f563a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/LocationTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/LocationTag.java
@@ -1582,10 +1582,10 @@ public static void registerTags() {
                 for (String str : attribute.contextAsType(1, ListTag.class)) {
                     types.add(EntityTag.valueOf(str, attribute.context).getBukkitEntityType());
                 }
-                result = object.getWorld().rayTraceEntities(object, object.getDirection(), range, (e) -> types.contains(e.getType()));
+                result = object.getWorld().rayTrace(object, object.getDirection(), range, FluidCollisionMode.NEVER, true, 0, (e) -> types.contains(e.getType()));
             }
             else {
-                result = object.getWorld().rayTraceEntities(object, object.getDirection(), range);
+                result = object.getWorld().rayTrace(object, object.getDirection(), range, FluidCollisionMode.NEVER, true, 0, null);
             }
             if (result != null && result.getHitEntity() != null) {
                 return new EntityTag(result.getHitEntity());
@@ -1620,10 +1620,10 @@ public static void registerTags() {
                 for (String str : attribute.contextAsType(1, ListTag.class)) {
                     types.add(EntityTag.valueOf(str, attribute.context).getBukkitEntityType());
                 }
-                result = object.getWorld().rayTraceEntities(object, object.getDirection(), range, (e) -> types.contains(e.getType()));
+                result = object.getWorld().rayTrace(object, object.getDirection(), range, FluidCollisionMode.NEVER, true, 0, (e) -> types.contains(e.getType()));
             }
             else {
-                result = object.getWorld().rayTraceEntities(object, object.getDirection(), range);
+                result = object.getWorld().rayTrace(object, object.getDirection(), range, FluidCollisionMode.NEVER, true, 0, null);
             }
             if (result != null) {
                 return new LocationTag(object.getWorld(), result.getHitPosition());

diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/AttackCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/AttackCommand.java
@@ -55,7 +55,7 @@ public AttackCommand() {
     //
     // @Usage
     // Use to stop an entity from attacking.
-    // - attack <[entity]> stop
+    // - attack <[entity]> cancel
     // -->
 
     @Override