Map code bugfixes

Author: LoneWolfHT

mods/ctf/ctf_map/map_functions.lua

@@ -61,9 +61,11 @@ local ID_WATER = minetest.get_content_id("default:water_source")
 ---@param mapmeta table Map meta table
 ---@param callback function
 function ctf_map.remove_barrier(mapmeta, callback)
-	local pos1, pos2 = mapmeta.barrier_area.pos1, mapmeta.barrier_area.pos2
-
 	if not mapmeta.barriers then
+		minetest.log("action", "Clearing barriers using mapmeta.barrier_area")
+
+		local pos1, pos2 = mapmeta.barrier_area.pos1, mapmeta.barrier_area.pos2
+
 		local vm = VoxelManip(pos1, pos2)
 		local data = vm:get_data()
 
@@ -112,7 +114,7 @@ function ctf_map.remove_barrier(mapmeta, callback)
 		end
 
 		minetest.after(i - 0.04, function()
-			local vm = VoxelManip(pos1, pos2)
+			local vm = VoxelManip(mapmeta.pos1, mapmeta.pos2)
 			vm:update_liquids()
 
 			callback()

mods/ctf/ctf_map/map_meta.lua

@@ -188,10 +188,6 @@ function ctf_map.load_map_meta(idx, dirname)
 
 					map.barriers = barriers
 				else
-					if ctf_core.settings.server_mode ~= "mapedit" then
-						assert(false, "Map "..dirname.." has a corrupted barriers file. Re-save map to fix")
-					end
-
 					minetest.log("error", "Map "..dirname.." has a corrupted barriers file. Re-save map to fix")
 				end
 			else
@@ -334,8 +330,6 @@ function ctf_map.save_map(mapmeta)
 		end
 	end
 
-	barrier_area.pos1 = vector.subtract(barrier_area.pos1, mapmeta.offset)
-
 	meta:set("map_version"   , CURRENT_MAP_VERSION)
 	meta:set("size"          , minetest.serialize(vector.subtract(mapmeta.pos2, mapmeta.pos1)))
 	meta:set("enabled"       , mapmeta.enabled and "true" or "false")