update command script source context

DenizenScript · Oct 30, 2019 · 86bd3a3 · 86bd3a3
1 parent c624f93
commit 86bd3a3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/...main/java/com/denizenscript/denizen/objects/properties/inventory/InventoryUniquifier.java b/...main/java/com/denizenscript/denizen/objects/properties/inventory/InventoryUniquifier.java
@@ -8,7 +8,6 @@
 public class InventoryUniquifier implements Property {
 
     public static boolean describes(ObjectTag inventory) {
-        // All inventories can potentially have a uniquifier
         return inventory instanceof InventoryTag
                 && (((InventoryTag) inventory).getIdType() != null
                 && (((InventoryTag) inventory).getIdType().equals("generic")

diff --git a/...c/main/java/com/denizenscript/denizen/scripts/containers/core/CommandScriptContainer.java b/...c/main/java/com/denizenscript/denizen/scripts/containers/core/CommandScriptContainer.java
@@ -103,7 +103,7 @@ public class CommandScriptContainer extends ScriptContainer {
     //   # Available context:
     //   # <context.args> returns a list of input arguments.
     //   # <context.raw_args> returns all the arguments as raw text.
-    //   # <context.server> returns whether the server is running the command (a player if false).
+    //   # <context.source_type> returns the source of the command. Can be: PLAYER, SERVER, COMMAND_BLOCK, or COMMAND_MINECART.
     //   # <context.alias> returns the command alias being used.
     //   # <context.command_block_location> returns the command block's location (if the command was run from one).
     //   # <context.command_minecart> returns the EntityTag of the command minecart (if the command was run from one).

diff --git a/...in/src/main/java/com/denizenscript/denizen/utilities/command/scripted/DenizenCommand.java b/...in/src/main/java/com/denizenscript/denizen/utilities/command/scripted/DenizenCommand.java
@@ -134,14 +134,22 @@ public boolean execute(CommandSender commandSender, String commandLabel, String[
                 player = PlayerTag.mirrorBukkitPlayer(pl);
             }
             context.put("server", new ElementTag(false));
+            context.put("source_type", new ElementTag("player"));
         }
         else {
-            context.put("server", new ElementTag(true));
             if (commandSender instanceof BlockCommandSender) {
                 context.put("command_block_location", new LocationTag(((BlockCommandSender) commandSender).getBlock().getLocation()));
+                context.put("server", new ElementTag(false));
+                context.put("source_type", new ElementTag("command_block"));
             }
             else if (commandSender instanceof CommandMinecart) {
                 context.put("command_minecart", new EntityTag((CommandMinecart) commandSender));
+                context.put("server", new ElementTag(false));
+                context.put("source_type", new ElementTag("command_minecart"));
+            }
+            else {
+                context.put("server", new ElementTag(true));
+                context.put("source_type", new ElementTag("server"));
             }
         }
         if (Depends.citizens != null && npc == null) {