Merge branch 'EliasFleckenstein03:master' into master

[elidragon.git] / warps.lua

diff --git a/warps.lua b/warps.lua
index 7ebe8d2c7b9000bffc5390a48edf40b2f213ab9a..6079c626afcae6da1736c1275f30973aa9150502 100755 (executable)
--- a/warps.lua
+++ b/warps.lua
@@ -1,44 +1,43 @@
 elidragon.warps = {
-    {
-        name = "shop",
-        desc = "Shop",
-        pos = {x = 0, y = 1000.5, z = 0}
-    },
-    {
-        name = "hub",
-        desc = "Hub",
-        pos = {x = 10071, y = 10003, z = 9951},
-    },
-    {
-               name = "pvp",
-               desc = "Pvp Area",
+       shop = {
+               desc = "Shop",
+               pos = {x = 0, y = 1000.5, z = 0}
+       },
+       hub = {
+               desc = "Hub",
+               pos = {x = 10071, y = 10003, z = 9951},
+       },
+       pvp = {
+               desc = "PvP Area",
                pos = {x = 20025, y = 1003, z = 1025},
-    },
-    {
-        name = "spawn",
-        desc = "Spawn",
-        pos = {x = -21, y = 10202.5, z = -5},
-        restricted = true
-    },
-    {
-        name = "jump",
-        desc = "Jumping area",
-        pos = {x = 12286, y = 12347, z = 12556},
-    },
-} 
-for _, warp in pairs(elidragon.warps) do
-    local desc = "Warp to " .. warp.desc
-    if warp.restricted then
-        desc = desc .. " [only for staff members]"
-    end
-    minetest.register_chatcommand(warp.name, {
-        description = desc,
-        privs = {teleport = warp.restricted},
-        func = function(name)
-            local player = minetest.get_player_by_name(name)
-            if player then
-                player:set_pos(warp.pos)
-            end
-        end
-    })
+       },
+       spawn = {
+               desc = "Spawn",
+               pos = {x = -21, y = 10202.5, z = -5},
+               restricted = true
+       },
+       jump = {
+               desc = "Jumping area",
+               pos = {x = 12286, y = 12347, z = 12556},
+       },
+}
+
+for warp_name, warp in pairs(elidragon.warps) do
+       local desc = "Warp to " .. warp.desc
+
+       if warp.restricted then
+               desc = desc .. " [only for staff members]"
+       end
+
+       minetest.register_chatcommand(warp_name, {
+               description = desc,
+               privs = {teleport = warp.restricted},
+               func = function(name)
+                       local player = minetest.get_player_by_name(name)
+
+                       if player then
+                               player:set_pos(warp.pos)
+                       end
+               end
+       })
 end