Bugfix, Cleanup

diff --git a/src/main/lobby.lua b/src/main/lobby.lua
index d8549b315f4d42f47d17eed1b3700c01d2493a07..c54f0c9339795dae294a1a298f0b1039624708c7 100644 (file)
--- a/src/main/lobby.lua
+++ b/src/main/lobby.lua
@@ -23,18 +23,6 @@ function skycraft.join_skyblock(name)
        end
 end
 
-function skycraft.lobby_tick()
-       local players = minetest.get_connected_players()
-       for _, player in pairs(players) do
-               local name = player:get_player_name()
-               local privs = minetest.get_player_privs(name)
-               local pos = player:get_pos()
-               privs.skycraft = (pos.y < 5000 or privs.protection_bypass) and true or nil
-               minetest.set_player_privs(name, privs)
-    end
-    minetest.after(0.5, skycraft.lobby_tick)
-end
-
 minetest.register_chatcommand("lobby", {
        description = "Warp to the Lobby",
        func = skycraft.join_lobby
@@ -71,4 +59,13 @@ minetest.register_on_player_hpchange(function(player, hp_change)
        return (player:get_pos().y > 5000) and 0 or hp_change
 end, true)
 
-skycraft.lobby_tick()
+minetest.register_globalstep(function()
+       local players = minetest.get_connected_players()
+       for _, player in pairs(players) do
+               local name = player:get_player_name()
+               local privs = minetest.get_player_privs(name)
+               local pos = player:get_pos()
+               privs.skycraft = (pos.y < 5000 or privs.protection_bypass) and true or nil
+               minetest.set_player_privs(name, privs)
+    end
+end)

diff --git a/src/main/lucky_block.lua b/src/main/lucky_block.lua
index 3470b0bc1eecf7793bcd79c3fdcb014f23bdceed..45d223ed2414d07ff5fe1669ee930448faf213cf 100644 (file)
--- a/src/main/lucky_block.lua
+++ b/src/main/lucky_block.lua
@@ -7,7 +7,7 @@ minetest.override_item("lucky_block:lucky_block", {
        inventory_image = minetest.inventorycube("skycraft_lucky_block.png"),
        light_source = nil,
        on_dig = function(pos, node, digger)
-               if not minetest.is_protected(pos, digger) then old_on_dig(pos, node, digger) end
+               if not minetest.is_protected(pos, digger:get_player_name()) then old_on_dig(pos, node, digger) end
        end
 })