Merge pull request #4 from HimbeerserverDE/master

[elidragon.git] / ranks.lua

diff --git a/ranks.lua b/ranks.lua
index 1e50217cdc30c2000dd5e1d978c209a79122fe86..0274a25eb4da6b3ff23eef516e72c9ad94806581 100755 (executable)
--- a/ranks.lua
+++ b/ranks.lua
@@ -43,26 +43,19 @@ elidragon.ranks = {
        },
 }
 
-function elidragon.load_legacy_ranks()
-       local file = io.open(minetest.get_worldpath() .. "/ranks.json", "r")
-       if file then
-               local ranks = minetest.parse_json(file:read())
-               file:close()
-               return ranks
-       end
-end
-
-elidragon.savedata.ranks = elidragon.savedata.ranks or elidragon.load_legacy_ranks() or {}
+local s = minetest.get_mod_storage()
+local deferred = minetest.deserialize(s:get_string("deferred_rank_changes"))
 
 function elidragon.get_rank(player)
-    local rank = player:get_meta():get("elidragon:rank") or "player"
+    local rank = player:get_meta():get_string("elidragon:rank")
+    if not rank or rank == "" then rank = "player" end
     return elidragon.get_rank_by_name(rank)
 end
 
 function elidragon.get_rank_by_name(rankname)
-       for _, rank in pairs(elidragon.ranks) do
+       for i, rank in pairs(elidragon.ranks) do
                if rank.name == rankname then
-                       return rank
+                       return rank, i
                end
        end
 end
@@ -84,12 +77,6 @@ function elidragon.update_nametag(player)
 end
 
 minetest.register_on_joinplayer(function(player)
-       local name = player:get_player_name()
-       local rank = elidragon.savedata.ranks[name]
-       if rank then
-               player:get_meta():set_string("elidragon:rank", rank)
-               elidragon.savedata.ranks[name] = nil
-       end
     minetest.chat_send_all(elidragon.get_player_name(player, true) .. "has joined the Server.")
     if irc and irc.connected and irc.config.send_join_part then
         irc.say(elidragon.get_player_name(player) .. "has joined the Server.")
@@ -119,16 +106,7 @@ minetest.register_chatcommand("rank", {
        description = "Set a player's rank (admin|developer|moderator|helper|builder|vip|player)",
        privs = {privs = true},
        func = function(name, param)
-               local target = param:split(" ")[1] or ""
-               local rank = param:split(" ")[2] or ""
-               local target_ref = minetest.get_player_by_name(target)
-               local rank_ref = elidragon.get_rank_by_name(rank)
-               if not rank_ref then 
-            return false, "Invalid Rank: " .. rank
-               elseif not target_ref then
-                       return false, "Player not online"
-        else
-                       target_ref:get_meta():set_string("elidragon:rank", rank)
+               local set_rank = function()
                        local privs = {}
                        for _, r in pairs(elidragon.ranks) do
                                for k, v in pairs(r.privs) do
@@ -140,7 +118,34 @@ minetest.register_chatcommand("rank", {
                        end
                        minetest.set_player_privs(target, privs)
                        minetest.chat_send_all(target .. " is now a " .. minetest.colorize(rank_ref.color, rank_ref.name))
+               end
+
+               local target = param:split(" ")[1] or ""
+               local rank = param:split(" ")[2] or ""
+               local target_ref = minetest.get_player_by_name(target)
+               local rank_ref = elidragon.get_rank_by_name(rank)
+               if not rank_ref then 
+                       return false, "Invalid Rank: " .. rank
+               elseif not target_ref then
+                       deferred[target] = rank
+                       set_rank()
+               else
+                       target_ref:get_meta():set_string("elidragon:rank", rank)
+                       set_rank()
                        elidragon.update_nametag(target_ref)
                end
        end,
 })
+
+minetest.register_on_joinplayer(function(player)
+       local name = player:get_player_name()
+       if deferred[name] then
+               player:get_meta():set_string("elidragon:rank", deferred[name])
+               elidragon.update_nametag(player)
+               deferred[name] = nil
+       end
+end)
+
+minetest.register_on_shutdown(function()
+       s:set_string("deferred_rank_changes", minetest.serialize(deferred))
+end)