Cleanup and fixup

[worldedit.git] / worldedit_commands / mark.lua

diff --git a/worldedit_commands/mark.lua b/worldedit_commands/mark.lua
index e07e84925bcd0b18cb16f90c8b358147cabf22bc..4062cae0e32f714d4541f618a8d4b4b6e5d36222 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
@@ -76,7 +76,7 @@ worldedit.mark_region = function(name)
                                visual_size={x=sizex * 2, y=sizey * 2},\r
                                collisionbox = {-sizex, -sizey, -thickness, sizex, sizey, thickness},\r
                        })\r
-                       marker:get_luaentity().name = name\r
+                       marker:get_luaentity().player_name = name\r
                        table.insert(markers, marker)\r
                end\r
 \r
@@ -88,7 +88,7 @@ worldedit.mark_region = function(name)
                                collisionbox = {-thickness, -sizey, -sizez, thickness, sizey, sizez},\r
                        })\r
                        marker:setyaw(math.pi / 2)\r
-                       marker:get_luaentity().name = name\r
+                       marker:get_luaentity().player_name = name\r
                        table.insert(markers, marker)\r
                end\r
 \r
@@ -107,13 +107,13 @@ 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
 })\r
 \r
@@ -128,13 +128,13 @@ 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
 })\r
 \r
@@ -147,15 +147,16 @@ minetest.register_entity(":worldedit:region_cube", {
                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
+               for _, entity in ipairs(worldedit.marker_region[self.player_name]) 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
+})\r
+\r