Merge pull request #8166 from Warr1024/fix7020

[dragonfireclient.git] / builtin / game / privileges.lua

diff --git a/builtin/game/privileges.lua b/builtin/game/privileges.lua
index bd5ead62400e39ec2e4aa2252c5c5e5414cc086d..c7417d2f43a54a0c45a2cf000cbb89fee9b9a0fc 100644 (file)
--- a/builtin/game/privileges.lua
+++ b/builtin/game/privileges.lua
@@ -11,11 +11,14 @@ function core.register_privilege(name, param)
                if def.give_to_singleplayer == nil then
                        def.give_to_singleplayer = true
                end
+               if def.give_to_admin == nil then
+                       def.give_to_admin = def.give_to_singleplayer
+               end
                if def.description == nil then
                        def.description = "(no description)"
                end
        end
-       local def = {}
+       local def
        if type(param) == "table" then
                def = param
        else
@@ -26,29 +29,73 @@ function core.register_privilege(name, param)
 end
 
 core.register_privilege("interact", "Can interact with things and modify the world")
-core.register_privilege("teleport", "Can use /teleport command")
-core.register_privilege("bring", "Can teleport other players")
-core.register_privilege("settime", "Can use /time")
-core.register_privilege("privs", "Can modify privileges")
-core.register_privilege("basic_privs", "Can modify 'shout' and 'interact' privileges")
-core.register_privilege("server", "Can do server maintenance stuff")
-core.register_privilege("protection_bypass", "Can bypass node protection in the world")
 core.register_privilege("shout", "Can speak in chat")
-core.register_privilege("ban", "Can ban and unban players")
-core.register_privilege("kick", "Can kick players")
-core.register_privilege("give", "Can use /give and /giveme")
-core.register_privilege("password", "Can use /setpassword and /clearpassword")
+core.register_privilege("basic_privs", "Can modify 'shout' and 'interact' privileges")
+core.register_privilege("privs", "Can modify privileges")
+
+core.register_privilege("teleport", {
+       description = "Can teleport self",
+       give_to_singleplayer = false,
+})
+core.register_privilege("bring", {
+       description = "Can teleport other players",
+       give_to_singleplayer = false,
+})
+core.register_privilege("settime", {
+       description = "Can set the time of day using /time",
+       give_to_singleplayer = false,
+})
+core.register_privilege("server", {
+       description = "Can do server maintenance stuff",
+       give_to_singleplayer = false,
+       give_to_admin = true,
+})
+core.register_privilege("protection_bypass", {
+       description = "Can bypass node protection in the world",
+       give_to_singleplayer = false,
+})
+core.register_privilege("ban", {
+       description = "Can ban and unban players",
+       give_to_singleplayer = false,
+       give_to_admin = true,
+})
+core.register_privilege("kick", {
+       description = "Can kick players",
+       give_to_singleplayer = false,
+       give_to_admin = true,
+})
+core.register_privilege("give", {
+       description = "Can use /give and /giveme",
+       give_to_singleplayer = false,
+})
+core.register_privilege("password", {
+       description = "Can use /setpassword and /clearpassword",
+       give_to_singleplayer = false,
+       give_to_admin = true,
+})
 core.register_privilege("fly", {
-       description = "Can fly using the free_move mode",
+       description = "Can use fly mode",
        give_to_singleplayer = false,
 })
 core.register_privilege("fast", {
-       description = "Can walk fast using the fast_move mode",
+       description = "Can use fast mode",
        give_to_singleplayer = false,
 })
 core.register_privilege("noclip", {
-       description = "Can fly through walls",
+       description = "Can fly through solid nodes using noclip mode",
+       give_to_singleplayer = false,
+})
+core.register_privilege("rollback", {
+       description = "Can use the rollback functionality",
+       give_to_singleplayer = false,
+})
+core.register_privilege("debug", {
+       description = "Allows enabling various debug options that may affect gameplay",
        give_to_singleplayer = false,
+       give_to_admin = true,
 })
-core.register_privilege("rollback", "Can use the rollback functionality")
 
+core.register_can_bypass_userlimit(function(name, ip)
+       local privs = core.get_player_privs(name)
+       return privs["server"] or privs["ban"] or privs["privs"] or privs["password"]
+end)