From fe282c35e5273069004fdbb7ff9d41bef38613f1 Mon Sep 17 00:00:00 2001 From: Alex 'mcmonkey' Goodwin Date: Wed, 1 Jan 2020 02:34:46 -0800 Subject: [PATCH] fix entity targets event, some meta --- .../denizen/events/entity/EntityTargetsScriptEvent.java | 2 +- .../main/java/com/denizenscript/denizen/objects/WorldTag.java | 2 +- .../denizen/scripts/commands/entity/ShootCommand.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityTargetsScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityTargetsScriptEvent.java index e23340b212..c4b7725214 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityTargetsScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityTargetsScriptEvent.java @@ -96,7 +96,7 @@ public boolean applyDetermination(ScriptPath path, ObjectTag determinationObj) { @Override public ScriptEntryData getScriptEntryData() { - return new BukkitScriptEntryData(entity); + return new BukkitScriptEntryData(target); } @Override diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/WorldTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/WorldTag.java index 18d638f1bf..a0f64b4afa 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/WorldTag.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/WorldTag.java @@ -384,7 +384,7 @@ public static void registerTags() { return new LocationTag(object.getWorld().getSpawnLocation()); }); - // <-- [tag] + // <--[tag] // @attribute // @returns ElementTag // @description diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/ShootCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/ShootCommand.java index c05d3478e7..9b62ee34bd 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/ShootCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/ShootCommand.java @@ -56,7 +56,7 @@ public class ShootCommand extends AbstractCommand implements Listener, Holdable // // Use the 'script:' argument to run a task script when the projectiles land. // When that script runs, the following definitions will be available: - // <[shot_entities]> for all shot entities, + // <[shot_entities]> for all shot entities (as in, the projectiles), // <[last_entity]> for the last one (The controlling entity), // <[location]> for the last known location of the last shot entity, and // <[hit_entities]> for a list of any entities that were hit by fired projectiles. @@ -68,7 +68,7 @@ public class ShootCommand extends AbstractCommand implements Listener, Holdable // The shoot command is ~waitable. Refer to <@link language ~waitable>. // // @Tags - // returns a ListTag of entities that were shot. + // returns a ListTag of entities that were shot (as in, the projectiles). // // @Usage // Use to shoot an arrow from the NPC to perfectly hit the player.