Merge branch 'enhance-execution' into release

project-topaz · Aug 29, 2020 · b1fe7fc · b1fe7fc
2 parents 0f12d94 + 6470b92
commit b1fe7fc
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/scripts/commands/exec.lua b/scripts/commands/exec.lua
@@ -25,8 +25,12 @@ function onTrigger(player, str)
     local old_os = os
     os = nil
 
+    -- Define "player" and "target" inside the string for use by the caller
+    local define_player = "local player = GetPlayerByName(\"" .. player:getName() .. "\"); "
+    local define_target = "local target = player:getCursorTarget(); "
+
     -- Ensure the command compiles / is valid..
-    local scriptObj, err = loadstring(str)
+    local scriptObj, err = loadstring(define_player .. define_target .. str)
     if (scriptObj == nil) then
         player:PrintToPlayer("Failed to load the given string.")
         player:PrintToPlayer(err)
@@ -37,7 +41,7 @@ function onTrigger(player, str)
     -- Execute the string..
     local status, err = pcall(scriptObj)
     if (status == false) then
-        player:PrintToPlayer(err)
+        player:PrintToPlayer("Error calling: " .. str .. "\n" .. err)
     end
 
     -- Restore the os table..