better remove command debug output

DenizenScript · Sep 30, 2020 · 99ffaeb · 99ffaeb
1 parent 16f9921
commit 99ffaeb
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/RemoveCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/RemoveCommand.java
@@ -84,7 +84,8 @@ public void execute(final ScriptEntry scriptEntry) {
         List<EntityTag> entities = (List<EntityTag>) scriptEntry.getObject("entities");
         WorldTag world = scriptEntry.getObjectTag("world");
         if (scriptEntry.dbCallShouldDebug()) {
-            Debug.report(scriptEntry, getName(), ArgumentHelper.debugList("entities", entities));
+            Debug.report(scriptEntry, getName(), (world == null ? "" : world.debug())
+                    + ArgumentHelper.debugList("entities", entities));
         }
         for (EntityTag entity : entities) {
             if (!entity.isGeneric()) {
@@ -96,11 +97,14 @@ public void execute(final ScriptEntry scriptEntry) {
                 }
             }
             else {
+                int removed = 0;
                 for (Entity worldEntity : world.getEntities()) {
                     if (entity.getEntityType().equals(DenizenEntityType.getByEntity(worldEntity))) {
                         worldEntity.remove();
+                        removed++;
                     }
                 }
+                Debug.echoDebug(scriptEntry, "Removed " + removed + " entities from the world.");
             }
         }
     }