diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/PushCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/PushCommand.java index a540803274..0fd48f3b9b 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/PushCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/PushCommand.java @@ -184,6 +184,7 @@ public void execute(final ScriptEntry scriptEntry) throws CommandExecutionExcept BukkitRunnable task = new BukkitRunnable() { int runs = 0; + dLocation lastLocation; @Override public void run() { @@ -206,6 +207,7 @@ public void run() { if (lastEntity.getLocation().add(v3).getBlock().getType() != Material.AIR) { runs = maxTicks; } + lastLocation = lastEntity.getLocation(); } else { this.cancel(); @@ -218,6 +220,8 @@ public void run() { ScriptQueue queue = InstantQueue.getQueue(ScriptQueue._getNextId()).addEntries(entries); if (lastEntity.getLocation() != null) queue.addDefinition("location", lastEntity.getLocation().identify()); + else + queue.addDefinition("location", lastLocation.identify()); queue.addDefinition("pushed_entities", entityList.toString()); queue.addDefinition("last_entity", lastEntity.identify()); queue.start();