Make region marker entities withstand TNT explosions

[worldedit.git] / worldedit_commands / mark.lua

diff --git a/worldedit_commands/mark.lua b/worldedit_commands/mark.lua
index e07e84925bcd0b18cb16f90c8b358147cabf22bc..cb45075c48848a6bdfc90c07107fec5d3e9d765f 100644 (file)
--- a/worldedit_commands/mark.lua
+++ b/worldedit_commands/mark.lua
@@ -19,7 +19,7 @@ worldedit.mark_pos1 = function(name)
                --add marker\r
                worldedit.marker1[name] = minetest.add_entity(pos1, "worldedit:pos1")\r
                if worldedit.marker1[name] ~= nil then\r
-                       worldedit.marker1[name]:get_luaentity().name = name\r
+                       worldedit.marker1[name]:get_luaentity().player_name = name\r
                end\r
        end\r
        worldedit.mark_region(name)\r
@@ -42,7 +42,7 @@ worldedit.mark_pos2 = function(name)
                --add marker\r
                worldedit.marker2[name] = minetest.add_entity(pos2, "worldedit:pos2")\r
                if worldedit.marker2[name] ~= nil then\r
-                       worldedit.marker2[name]:get_luaentity().name = name\r
+                       worldedit.marker2[name]:get_luaentity().player_name = name\r
                end\r
        end\r
        worldedit.mark_region(name)\r
@@ -58,8 +58,19 @@ worldedit.mark_region = function(name)
                end\r
                worldedit.marker_region[name] = nil\r
        end\r
+\r
        if pos1 ~= nil and pos2 ~= nil then\r
                local pos1, pos2 = worldedit.sort_pos(pos1, pos2)\r
+\r
+               local vec = vector.subtract(pos2, pos1)\r
+               local maxside = math.max(vec.x, math.max(vec.y, vec.z))\r
+               local limit = tonumber(minetest.settings:get("active_object_send_range_blocks")) * 16\r
+               if maxside > limit * 1.5 then\r
+                       -- The client likely won't be able to see the plane markers as intended anyway,\r
+                       -- thus don't place them and also don't load the area into memory\r
+                       return\r
+               end\r
+\r
                local thickness = 0.2\r
                local sizex, sizey, sizez = (1 + pos2.x - pos1.x) / 2, (1 + pos2.y - pos1.y) / 2, (1 + pos2.z - pos1.z) / 2\r
 \r
@@ -72,24 +83,28 @@ worldedit.mark_region = function(name)
                --XY plane markers\r
                for _, z in ipairs({pos1.z - 0.5, pos2.z + 0.5}) do\r
                        local marker = minetest.add_entity({x=pos1.x + sizex - 0.5, y=pos1.y + sizey - 0.5, z=z}, "worldedit:region_cube")\r
-                       marker:set_properties({\r
-                               visual_size={x=sizex * 2, y=sizey * 2},\r
-                               collisionbox = {-sizex, -sizey, -thickness, sizex, sizey, thickness},\r
-                       })\r
-                       marker:get_luaentity().name = name\r
-                       table.insert(markers, marker)\r
+                       if marker ~= nil then\r
+                               marker:set_properties({\r
+                                       visual_size={x=sizex * 2, y=sizey * 2},\r
+                                       collisionbox = {-sizex, -sizey, -thickness, sizex, sizey, thickness},\r
+                               })\r
+                               marker:get_luaentity().player_name = name\r
+                               table.insert(markers, marker)\r
+                       end\r
                end\r
 \r
                --YZ plane markers\r
                for _, x in ipairs({pos1.x - 0.5, pos2.x + 0.5}) do\r
                        local marker = minetest.add_entity({x=x, y=pos1.y + sizey - 0.5, z=pos1.z + sizez - 0.5}, "worldedit:region_cube")\r
-                       marker:set_properties({\r
-                               visual_size={x=sizez * 2, y=sizey * 2},\r
-                               collisionbox = {-thickness, -sizey, -sizez, thickness, sizey, sizez},\r
-                       })\r
-                       marker:setyaw(math.pi / 2)\r
-                       marker:get_luaentity().name = name\r
-                       table.insert(markers, marker)\r
+                       if marker ~= nil then\r
+                               marker:set_properties({\r
+                                       visual_size={x=sizez * 2, y=sizey * 2},\r
+                                       collisionbox = {-thickness, -sizey, -sizez, thickness, sizey, sizez},\r
+                               })\r
+                               marker:set_yaw(math.pi / 2)\r
+                               marker:get_luaentity().player_name = name\r
+                               table.insert(markers, marker)\r
+                       end\r
                end\r
 \r
                worldedit.marker_region[name] = markers\r
@@ -107,13 +122,16 @@ minetest.register_entity(":worldedit:pos1", {
                physical = false,\r
        },\r
        on_step = function(self, dtime)\r
-               if worldedit.marker1[self.name] == nil then\r
+               if worldedit.marker1[self.player_name] == nil then\r
                        self.object:remove()\r
                end\r
        end,\r
        on_punch = function(self, hitter)\r
                self.object:remove()\r
-               worldedit.marker1[self.name] = nil\r
+               worldedit.marker1[self.player_name] = nil\r
+       end,\r
+       on_blast = function(self, damage)\r
+               return false, false, {} -- don't damage or knockback\r
        end,\r
 })\r
 \r
@@ -128,34 +146,44 @@ minetest.register_entity(":worldedit:pos2", {
                physical = false,\r
        },\r
        on_step = function(self, dtime)\r
-               if worldedit.marker2[self.name] == nil then\r
+               if worldedit.marker2[self.player_name] == nil then\r
                        self.object:remove()\r
                end\r
        end,\r
        on_punch = function(self, hitter)\r
                self.object:remove()\r
-               worldedit.marker2[self.name] = nil\r
+               worldedit.marker2[self.player_name] = nil\r
+       end,\r
+       on_blast = function(self, damage)\r
+               return false, false, {} -- don't damage or knockback\r
        end,\r
 })\r
 \r
 minetest.register_entity(":worldedit:region_cube", {\r
        initial_properties = {\r
                visual = "upright_sprite",\r
-               visual_size = {x=1.1, y=1.1},\r
                textures = {"worldedit_cube.png"},\r
                visual_size = {x=10, y=10},\r
                physical = false,\r
        },\r
        on_step = function(self, dtime)\r
-               if worldedit.marker_region[self.name] == nil then\r
+               if worldedit.marker_region[self.player_name] == nil then\r
                        self.object:remove()\r
                        return\r
                end\r
        end,\r
        on_punch = function(self, hitter)\r
-               for _, entity in ipairs(worldedit.marker_region[self.name]) do\r
+               local markers = worldedit.marker_region[self.player_name]\r
+               if not markers then\r
+                       return\r
+               end\r
+               for _, entity in ipairs(markers) do\r
                        entity:remove()\r
                end\r
-               worldedit.marker_region[self.name] = nil\r
+               worldedit.marker_region[self.player_name] = nil\r
        end,\r
-})
\ No newline at end of file
+       on_blast = function(self, damage)\r
+               return false, false, {} -- don't damage or knockback\r
+       end,\r
+})\r
+\r