Minor merge fixes

Author: MoNTE48

worldedit_brush/init.lua

@@ -19,7 +19,7 @@ local brush_on_use = function(itemstack, placer)
 		return false
 	end
 
-	local cmddef = minetest.registered_chatcommands["/" .. cmd]
+	local cmddef = worldedit.registered_commands[cmd]
 	if cmddef == nil then return false end -- shouldn't happen as //brush checks this
 
 	local has_privs, missing_privs = minetest.check_player_privs(name, cmddef.privs)
@@ -51,9 +51,13 @@ local brush_on_use = function(itemstack, placer)
 		return player_notify_old(name, msg)
 	end
 
+	assert(cmddef.require_pos < 2)
+	local parsed = {cmddef.parse(meta:get_string("params"))}
+	if not table.remove(parsed, 1) then return false end -- shouldn't happen
+
 	minetest.log("action", string.format("%s uses WorldEdit brush (//%s) at %s",
 		name, cmd, minetest.pos_to_string(pointed_thing.under)))
-	cmddef.func(name, meta:get_string("params"))
+	cmddef.func(name, unpack(parsed))
 
 	worldedit.player_notify = player_notify_old
 	return true

worldedit_commands/safe.lua

@@ -61,7 +61,7 @@ end)
 
 minetest.register_chatcommand("/y", {
 	params = "",
-	description = "Confirm a pending operation",
+	description = S("Confirm a pending operation"),
 	privs = {worldedit=true},
 	func = function(name)
 		local callback = safe_region_callback[name]
@@ -77,7 +77,7 @@ minetest.register_chatcommand("/y", {
 
 minetest.register_chatcommand("/n", {
 	params = "",
-	description = "Abort a pending operation",
+	description = S("Abort a pending operation"),
 	privs = {worldedit=true},
 	func = function(name)
 		if not safe_region_callback[name] then