improve shoot command def tracking

DenizenScript · Nov 24, 2019 · 129b8c8 · 129b8c8
1 parent 0a450b2
commit 129b8c8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/PushCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/PushCommand.java
@@ -310,13 +310,13 @@ public void run() {
                         ScriptQueue queue = new InstantQueue(script.getContainer().getName())
                                 .addEntries(entries);
                         if (lastEntity.getLocation() != null) {
-                            queue.addDefinition("location", lastEntity.getLocation().identify());
+                            queue.addDefinition("location", lastEntity.getLocation());
                         }
                         else {
-                            queue.addDefinition("location", lastLocation.identify());
+                            queue.addDefinition("location", lastLocation);
                         }
-                        queue.addDefinition("pushed_entities", entityList.toString());
-                        queue.addDefinition("last_entity", lastEntity.identify());
+                        queue.addDefinition("pushed_entities", entityList);
+                        queue.addDefinition("last_entity", lastEntity);
                         if (definitions != null) {
                             int x = 1;
                             String[] definition_names = null;

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
@@ -377,9 +377,9 @@ else if (lastLocation != null && lastVelocity != null) {
                                 .addEntries(entries);
 
                         // Add relevant definitions
-                        queue.addDefinition("location", lastLocation.identify());
-                        queue.addDefinition("shot_entities", entityList.toString());
-                        queue.addDefinition("last_entity", lastEntity.identify());
+                        queue.addDefinition("location", lastLocation);
+                        queue.addDefinition("shot_entities", entityList);
+                        queue.addDefinition("last_entity", lastEntity);
 
                         // Handle hit_entities definition
                         ListTag hitEntities = new ListTag();
@@ -392,7 +392,7 @@ else if (lastLocation != null && lastVelocity != null) {
                                 }
                             }
                         }
-                        queue.addDefinition("hit_entities", hitEntities.identify());
+                        queue.addDefinition("hit_entities", hitEntities);
                         if (definitions != null) {
                             int x = 1;
                             String[] definition_names = null;