nalc/server-nalc
1
0
Fork 0
mirror of https://github.com/sys4-fr/server-nalc.git synced 2025-04-04 03:30:33 +02:00
Code Issues Releases Wiki Activity

Updated worldedit

Browse Source
This commit is contained in:
LeMagnesium 2015-06-20 19:46:49 +02:00
parent 962fb7b64a
commit 09ca7fb48a
5 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mods/WorldEdit/worldedit/init.lua
View File

@ -41,3 +41,4 @@ load_module(path .. "/compatibility.lua")
if minetest.setting_getbool("log_mods") then if minetest.setting_getbool("log_mods") then
print("[WorldEdit] Loaded!") print("[WorldEdit] Loaded!")
end end

1
mods/WorldEdit/worldedit/manipulations.lua
View File

@ -594,3 +594,4 @@ function worldedit.clear_objects(pos1, pos2)
end end
return count return count
end end

25
mods/WorldEdit/worldedit_commands/init.lua
View File

@ -70,7 +70,7 @@ function worldedit.player_axis(name)
return "z", dir.z > 0 and 1 or -1 return "z", dir.z > 0 and 1 or -1
end end
function worldedit.mkdir(path) local function mkdir(path)
if minetest.mkdir then if minetest.mkdir then
minetest.mkdir(path) minetest.mkdir(path)
else else
@ -78,6 +78,10 @@ function worldedit.mkdir(path)
end end
end end
local function check_filename(name)
return name:find("^[%w%s%^&'@{}%[%],%$=!%-#%(%)%%%.%+~_]+$") ~= nil
end
minetest.register_chatcommand("/about", { minetest.register_chatcommand("/about", {
params = "", params = "",
@ -885,17 +889,16 @@ minetest.register_chatcommand("/save", {
worldedit.player_notify(name, "invalid usage: " .. param) worldedit.player_notify(name, "invalid usage: " .. param)
return return
end end
if not param:find("^[a-zA-Z0-9_%-.]+$") then if not check_filename(param) then
worldedit.player_notify(name, "Disallowed file name: " .. param) worldedit.player_notify(name, "Disallowed file name: " .. param)
return return
end end
local result, count = worldedit.serialize(worldedit.pos1[name], local result, count = worldedit.serialize(worldedit.pos1[name],
worldedit.pos2[name]) worldedit.pos2[name])
local path = minetest.get_worldpath() .. "/schems" local path = minetest.get_worldpath() .. "/schems"
-- Create directory if it does not already exist -- Create directory if it does not already exist
worldedit.mkdir(path) mkdir(path)
local filename = path .. "/" .. param .. ".we" local filename = path .. "/" .. param .. ".we"
local file, err = io.open(filename, "wb") local file, err = io.open(filename, "wb")
@ -923,8 +926,8 @@ minetest.register_chatcommand("/allocate", {
worldedit.player_notify(name, "invalid usage: " .. param) worldedit.player_notify(name, "invalid usage: " .. param)
return return
end end
if not string.find(param, "^[%w \t.,+-_=!@#$%%^&*()%[%]{};'\"]+$") then if not check_filename(param) then
worldedit.player_notify(name, "invalid file name: " .. param) worldedit.player_notify(name, "Disallowed file name: " .. param)
return return
end end
@ -1056,14 +1059,14 @@ minetest.register_chatcommand("/mtschemcreate", {
worldedit.player_notify(name, "No filename specified") worldedit.player_notify(name, "No filename specified")
return return
end end
if not param:find("^[a-zA-Z0-9_%-.]+$") then if not check_filename(param) then
worldedit.player_notify(name, "Disallowed file name: " .. param) worldedit.player_notify(name, "Disallowed file name: " .. param)
return return
end end
local path = minetest.get_worldpath() .. "/schems" local path = minetest.get_worldpath() .. "/schems"
-- Create directory if it does not already exist -- Create directory if it does not already exist
worldedit.mkdir(path) mkdir(path)
local filename = path .. "/" .. param .. ".mts" local filename = path .. "/" .. param .. ".mts"
local ret = minetest.create_schematic(worldedit.pos1[name], local ret = minetest.create_schematic(worldedit.pos1[name],
@ -1083,10 +1086,14 @@ minetest.register_chatcommand("/mtschemplace", {
description = "Load nodes from \"(world folder)/schems/<file>.mts\" with position 1 of the current WorldEdit region as the origin", description = "Load nodes from \"(world folder)/schems/<file>.mts\" with position 1 of the current WorldEdit region as the origin",
privs = {worldedit=true}, privs = {worldedit=true},
func = function(name, param) func = function(name, param)
if param == nil then if param == "" then
worldedit.player_notify(name, "no filename specified") worldedit.player_notify(name, "no filename specified")
return return
end end
if not check_filename(param) then
worldedit.player_notify(name, "Disallowed file name: " .. param)
return
end
local pos = get_position(name) local pos = get_position(name)
if pos == nil then return end if pos == nil then return end

1
mods/WorldEdit/worldedit_commands/safe.lua
View File

@ -65,3 +65,4 @@ minetest.register_chatcommand("/n", {
}) })
return safe_region, check_region return safe_region, check_region

2
mods/WorldEdit/worldedit_gui/functionality.lua
View File

@ -488,7 +488,7 @@ worldedit.register_gui_function("worldedit_gui_orient", {
get_formspec = function(name) get_formspec = function(name)
local angle = gui_angle[name] local angle = gui_angle[name]
return "size[5,3]" .. worldedit.get_formspec_header("worldedit_gui_orient") .. return "size[5,3]" .. worldedit.get_formspec_header("worldedit_gui_orient") ..
string.format("dropdown[0,1;2.5;worldedit_gui_rotate_angle;90 degrees,180 degrees,270 degrees;%s]", angle) .. string.format("dropdown[0,1;2.5;worldedit_gui_orient_angle;90 degrees,180 degrees,270 degrees;%s]", angle) ..
"button_exit[0,2.5;3,0.8;worldedit_gui_orient_submit;Orient]" "button_exit[0,2.5;3,0.8;worldedit_gui_orient_submit;Orient]"
end, end,
}) })