Add some position validation checks

Author: luk3yx

worldedit/cuboid.lua

@@ -17,8 +17,13 @@ worldedit.cuboid_volumetric_expand = function(name, amount)
 	delta_dir1, delta_dir2 = worldedit.get_expansion_directions(pos1, pos2)
 	delta1 = vector.multiply(delta1, delta_dir1)
 	delta2 = vector.multiply(delta2, delta_dir2)
-	worldedit.pos1[name] = vector.add(pos1, delta1)
-	worldedit.pos2[name] = vector.add(pos2, delta2)
+	local new_pos1 = vector.add(pos1, delta1)
+	local new_pos2 = vector.add(pos2, delta2)
+	if not minetest.is_valid_pos(new_pos1) or not minetest.is_valid_pos(new_pos2) then
+		return false, "Cannot select area outside of the map"
+	end
+	worldedit.pos1[name] = new_pos1
+	worldedit.pos2[name] = new_pos2
 
 	return true
 end
@@ -91,10 +96,16 @@ worldedit.marker_move = function(name, marker, deltavector)
 
 	if marker == 1 then
 		local pos = worldedit.pos1[name]
-		worldedit.pos1[name] = vector.add(deltavector, pos)
+		local new_pos = vector.add(deltavector, pos)
+		if minetest.is_valid_pos(new_pos) then
+			worldedit.pos1[name] = new_pos
+		end
 	else
 		local pos = worldedit.pos2[name]
-		worldedit.pos2[name] = vector.add(deltavector, pos)
+		local new_pos = vector.add(deltavector, pos)
+		if minetest.is_valid_pos(new_pos) then
+			worldedit.pos2[name] = new_pos
+		end
 	end
 
 	return true

worldedit_commands/init.lua

@@ -526,6 +526,7 @@ worldedit.register_command("pos1", {
 		if not player then return false end
 		local pos = player:get_pos()
 		pos.x, pos.y, pos.z = math.floor(pos.x + 0.5), math.floor(pos.y + 0.5), math.floor(pos.z + 0.5)
+		if not minetest.is_valid_pos(pos) then return false end
 		worldedit.pos1[name] = pos
 		worldedit.mark_pos1(name)
 		worldedit.player_notify(name, S("position @1 set to @2", 1, minetest.pos_to_string(pos)))
@@ -542,6 +543,7 @@ worldedit.register_command("pos2", {
 		if not player then return false end
 		local pos = player:get_pos()
 		pos.x, pos.y, pos.z = math.floor(pos.x + 0.5), math.floor(pos.y + 0.5), math.floor(pos.z + 0.5)
+		if not minetest.is_valid_pos(pos) then return false end
 		worldedit.pos2[name] = pos
 		worldedit.mark_pos2(name)
 		worldedit.player_notify(name, S("position @1 set to @2", 2, minetest.pos_to_string(pos)))
@@ -594,7 +596,9 @@ worldedit.register_command("fixedpos", {
 		if found == nil then
 			return false
 		end
-		return true, flag, vector.new(tonumber(x), tonumber(y), tonumber(z))
+		local pos = vector.new(tonumber(x), tonumber(y), tonumber(z))
+		if not minetest.is_valid_pos(pos) then return false end
+		return true, flag, pos
 	end,
 	func = function(name, flag, pos)
 		if flag == "set1" then

worldedit_commands/safe.lua

@@ -90,6 +90,10 @@ minetest.register_chatcommand("/n", {
 })
 
 local function safe_area(name, pos1, pos2)
+	if not minetest.is_valid_pos(pos1) or not minetest.is_valid_pos(pos2) then
+		return false
+	end
+
 	if abs(pos2.x - pos1.x) + 1 > max_size or abs(pos2.x - pos1.x) + 1 > max_size or
 			abs(pos2.z - pos1.z) + 1 > max_size then
 		worldedit.player_notify(name, S("Your selected area is too big, you can only select areas up to @1 × @2 × @3",