Barrier Additions by slimy_bananna_peel

mods/ctf/ctf_map/init.lua

@@ -248,6 +248,10 @@ minetest.register_chatcommand("ctf_barrier", {
 								data[vi] = minetest.get_content_id("ctf_map:ind_water")
 							elseif data[vi] == minetest.get_content_id("default:lava_source") then
 								data[vi] = minetest.get_content_id("ctf_map:ind_lava")
+							elseif data[vi] == minetest.get_content_id("poison_water:poisonous_water") then
+								data[vi] = minetest.get_content_id("ctf_map:ind_poison_water")
+							elseif data[vi] == minetest.get_content_id("default:river_water_source") then
+								data[vi] = minetest.get_content_id("ctf_map:ind_river_water")
 							end
 						elseif params == "remove_buildtime" then
 							if data[vi] == minetest.get_content_id("ctf_map:ind_glass_red") then
@@ -258,17 +262,24 @@ minetest.register_chatcommand("ctf_barrier", {
 								data[vi] = minetest.get_content_id("default:water_source")
 							elseif data[vi] == minetest.get_content_id("ctf_map:ind_lava") then
 								data[vi] = minetest.get_content_id("default:lava_source")
+							elseif data[vi] == minetest.get_content_id("ctf_map:ind_poison_water") then
+								data[vi] = minetest.get_content_id("poison_water:poisonous_water")
+							elseif data[vi] == minetest.get_content_id("ctf_map:ind_river_water") then
+								data[vi] = minetest.get_content_id("default:river_water_source")
 							end
 						elseif params == "place_outer" then
 							if x == pos1.x or x == pos2.x or y == pos1.y
 								or z == pos1.z or z == pos2.z then
-								if data[vi] == minetest.get_content_id("air") or
-									data[vi] == minetest.get_content_id("ignore") or
-                                    data[vi] == minetest.get_content_id("ctf_map:ind_glass") or
-									data[vi] == minetest.get_content_id("ctf_map:ignore") then
-									data[vi] = minetest.get_content_id("ctf_map:ind_glass")
-								else
-									data[vi] = minetest.get_content_id("ctf_map:stone")
+									local node = core.get_node({x = x, y = y, z = z})
+									local nodedef = minetest.registered_nodes[node.name]
+									local drawtype
+									if nodedef then
+										drawtype = nodedef.drawtype
+										end
+									if drawtype == "normal" or drawtype == "fencelike" or drawtype == "nodebox" then
+										data[vi] = minetest.get_content_id("ctf_map:stone")
+									else
+										data[vi] = minetest.get_content_id("ctf_map:ind_glass")
 								end
 							end
 						end

mods/ctf/ctf_map/nodes.lua

@@ -70,6 +70,42 @@ minetest.register_node("ctf_map:ind_water", {
 })
 ctf_map.barrier_nodes[minetest.get_content_id("ctf_map:ind_water")] = minetest.get_content_id("default:water_source")
 
+minetest.register_node("ctf_map:ind_river_water", {
+	description = S("Indestructible River Water Barrier Glass"),
+	drawtype = "glasslike",
+	tiles = {"ctf_map_ind_river_water.png"},
+	inventory_image = minetest.inventorycube("ctf_map_ind_river_water.png"),
+	paramtype = "light",
+	sunlight_propagates = true,
+	is_ground_content = false,
+	walkable = true,
+	buildable_to = false,
+	use_texture_alpha = false,
+	alpha = 0,
+	pointable = ctf_core.settings.server_mode == "mapedit",
+	groups = {immortal = 1},
+	sounds = default.node_sound_glass_defaults()
+})
+ctf_map.barrier_nodes[minetest.get_content_id("ctf_map:ind_river_water")] = minetest.get_content_id("default:river_water_source")
+
+minetest.register_node("ctf_map:ind_poison_water", {
+	description = S("Indestructible Poisonous Water Barrier Glass"),
+	drawtype = "glasslike",
+	tiles = {"ctf_map_ind_poison_water.png"},
+	inventory_image = minetest.inventorycube("ctf_map_ind_poison_water.png"),
+	paramtype = "light",
+	sunlight_propagates = true,
+	is_ground_content = false,
+	walkable = true,
+	buildable_to = false,
+	use_texture_alpha = false,
+	alpha = 0,
+	pointable = ctf_core.settings.server_mode == "mapedit",
+	groups = {immortal = 1},
+	sounds = default.node_sound_glass_defaults()
+})
+ctf_map.barrier_nodes[minetest.get_content_id("ctf_map:ind_poison_water")] = minetest.get_content_id("poison_water:poisonous_water")
+
 minetest.register_node("ctf_map:ind_lava", {
 	description = S("Indestructible Lava Barrier Glass"),
 	groups = {immortal = 1},