Fix //mix and improve normalize_nodename.

diff --git a/worldedit_commands/init.lua b/worldedit_commands/init.lua
index 53bd827cf3921df43aefb10a1a4f2cd49d597fc0..3613cfae38c50a676294304cdb2bb6cfaeb13859 100644 (file)
--- a/worldedit_commands/init.lua
+++ b/worldedit_commands/init.lua
@@ -38,6 +38,7 @@ end
 \r
 --determines whether `nodename` is a valid node name, returning a boolean\r
 worldedit.normalize_nodename = function(nodename)\r
+       nodename = nodename:gsub("^%s*(.-)%s*$", "%1")\r
        if nodename == "" then return nil end\r
        local fullname = ItemStack({name=nodename}):get_name() --resolve aliases of node names to full names\r
        if minetest.registered_nodes[fullname] or fullname == "air" then --directly found node name or alias of nodename\r
@@ -300,7 +301,7 @@ minetest.register_chatcommand("/mix", {
        privs = {worldedit=true},\r
        func = safe_region(function(name, param)\r
                local nodes = {}\r
-               for nodename in param:gmatch("[^,]+") do\r
+               for nodename in param:gmatch("[^%s]+") do\r
                        local node = get_node(name, nodename)\r
                        if not node then\r
                                worldedit.player_notify(name, "Could not identify node \"" .. name .. "\"")\r