Mirrorlandia_minetest/Minetest-WorldEditAdditions
1
0
Fork 0
mirror of https://github.com/sbrl/Minetest-WorldEditAdditions.git synced 2024-11-30 19:13:53 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/VorTechnix/Minetest-WorldEditAdditions

Browse Source
This commit is contained in:
VorTechnix 2021-03-11 12:59:07 -08:00
commit 97f8d551cd
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -7,6 +7,7 @@ Note to self: See the bottom of this file for the release template text.
- Add `//srect` (_select rectangle_), `//scol` (_select column_), `//scube` (_select cube_) - thanks, @VorTechnix! - Add `//srect` (_select rectangle_), `//scol` (_select column_), `//scube` (_select cube_) - thanks, @VorTechnix!
- Add `//spush`, `//spop`, and `//sstack` - Add `//spush`, `//spop`, and `//sstack`
- `//overlay`: Don't place nodes above water - `//overlay`: Don't place nodes above water
- `//multi`: Improve resilience by handling some edge cases
## v1.11: The big data update (25th January 2021) ## v1.11: The big data update (25th January 2021)

9
worldeditadditions_commands/commands/meta/multi.lua
View File

@ -36,6 +36,10 @@ minetest.register_chatcommand("/multi", {
description = "Executes multiple chat commands in sequence. Just prepend a list of space-separated chat commands with //multi, and you're good to go! The forward slashes at the beginning of each chat command must be the same as if you were executing it normally.", description = "Executes multiple chat commands in sequence. Just prepend a list of space-separated chat commands with //multi, and you're good to go! The forward slashes at the beginning of each chat command must be the same as if you were executing it normally.",
privs = { worldedit = true }, privs = { worldedit = true },
func = function(name, params_text) func = function(name, params_text)
if not params_text then return false, "Error: No commands specified, so there's nothing to do." end
params_text = worldeditadditions.trim(params_text)
if #params_text == 0 then return false, "Error: No commands specified, so there's nothing to do." end
local i = 1 -- For feedback only local i = 1 -- For feedback only
local master_start_time = worldeditadditions.get_ms_time() local master_start_time = worldeditadditions.get_ms_time()
@ -47,6 +51,7 @@ minetest.register_chatcommand("/multi", {
local found, _, command_name, args = command:find("^([^%s]+)%s(.+)$") local found, _, command_name, args = command:find("^([^%s]+)%s(.+)$")
if not found then command_name = command end if not found then command_name = command end
command_name = trim(command_name) command_name = trim(command_name)
if not args then args = "" end
worldedit.player_notify(name, "#"..i..": /"..command) worldedit.player_notify(name, "#"..i..": /"..command)
@ -55,9 +60,9 @@ minetest.register_chatcommand("/multi", {
return false, "Error: "..command_name.." isn't a valid command." return false, "Error: "..command_name.." isn't a valid command."
end end
if not minetest.check_player_privs(name, cmd.privs) then if not minetest.check_player_privs(name, cmd.privs) then
return false, "Your privileges are insufficient to execute one or more commands in that list." return false, "Your privileges are insufficient to execute /"..command_name..". Abort."
end end
-- print("[DEBUG] command_name", command_name, "cmd", dump2(cmd))
minetest.log("action", name.." runs "..command) minetest.log("action", name.." runs "..command)
cmd.func(name, args) cmd.func(name, args)