diff options
author | rubenwardy <rw@rubenwardy.com> | 2019-08-06 19:30:18 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-06 19:30:18 +0100 |
commit | 8e757859d6a6bf6482480904e8485e9344e567ab (patch) | |
tree | 3304aa9393a753b85143389c6f6ffec990cfa12e /builtin/game | |
parent | 8da35c22d1c8933090330b2f3c44b4cf2c6e6760 (diff) | |
download | minetest-8e757859d6a6bf6482480904e8485e9344e567ab.tar.gz minetest-8e757859d6a6bf6482480904e8485e9344e567ab.tar.bz2 minetest-8e757859d6a6bf6482480904e8485e9344e567ab.zip |
Add luacheck to check builtin (#7895)
Diffstat (limited to 'builtin/game')
-rw-r--r-- | builtin/game/chatcommands.lua | 57 | ||||
-rw-r--r-- | builtin/game/forceloading.lua | 2 | ||||
-rw-r--r-- | builtin/game/item.lua | 6 | ||||
-rw-r--r-- | builtin/game/misc.lua | 2 | ||||
-rw-r--r-- | builtin/game/privileges.lua | 2 | ||||
-rw-r--r-- | builtin/game/register.lua | 11 | ||||
-rw-r--r-- | builtin/game/statbars.lua | 22 |
7 files changed, 46 insertions, 56 deletions
diff --git a/builtin/game/chatcommands.lua b/builtin/game/chatcommands.lua index 60d5d4788..f05ca0bfd 100644 --- a/builtin/game/chatcommands.lua +++ b/builtin/game/chatcommands.lua @@ -27,8 +27,8 @@ core.register_on_chat_message(function(name, message) local has_privs, missing_privs = core.check_player_privs(name, cmd_def.privs) if has_privs then core.set_last_run_mod(cmd_def.mod_origin) - local success, message = cmd_def.func(name, param) - if message then + local _, result = cmd_def.func(name, param) + if result then core.chat_send_player(name, message) end else @@ -125,10 +125,10 @@ core.register_chatcommand("haspriv", { if core.check_player_privs(player_name, privs) then table.insert(players_with_priv, player_name) end - end + end return true, "Players online with the \"" .. param .. "\" privilege: " .. table.concat(players_with_priv, ", ") - end + end }) local function handle_grant_command(caller, grantname, grantprivstr) @@ -261,11 +261,12 @@ core.register_chatcommand("setpassword", { toname = param:match("^([^ ]+) *$") raw_password = nil end + if not toname then return false, "Name field required" end - local act_str_past = "?" - local act_str_pres = "?" + + local act_str_past, act_str_pres if not raw_password then core.set_player_password(toname, "") act_str_past = "cleared" @@ -277,13 +278,14 @@ core.register_chatcommand("setpassword", { act_str_past = "set" act_str_pres = "sets" end + if toname ~= name then core.chat_send_player(toname, "Your password was " .. act_str_past .. " by " .. name) end - core.log("action", name .. " " .. act_str_pres - .. " password of " .. toname .. ".") + core.log("action", name .. " " .. act_str_pres .. + " password of " .. toname .. ".") return true, "Password of player \"" .. toname .. "\" " .. act_str_past end, @@ -367,35 +369,35 @@ core.register_chatcommand("teleport", { return pos, false end - local teleportee = nil local p = {} p.x, p.y, p.z = string.match(param, "^([%d.-]+)[, ] *([%d.-]+)[, ] *([%d.-]+)$") p.x = tonumber(p.x) p.y = tonumber(p.y) p.z = tonumber(p.z) if p.x and p.y and p.z then + local lm = 31000 if p.x < -lm or p.x > lm or p.y < -lm or p.y > lm or p.z < -lm or p.z > lm then return false, "Cannot teleport out of map bounds!" end - teleportee = core.get_player_by_name(name) + local teleportee = core.get_player_by_name(name) if teleportee then teleportee:set_pos(p) return true, "Teleporting to "..core.pos_to_string(p) end end - local teleportee = nil - local p = nil - local target_name = nil - target_name = param:match("^([^ ]+)$") - teleportee = core.get_player_by_name(name) + local target_name = param:match("^([^ ]+)$") + local teleportee = core.get_player_by_name(name) + + p = nil if target_name then local target = core.get_player_by_name(target_name) if target then p = target:get_pos() end end + if teleportee and p then p = find_free_position_near(p) teleportee:set_pos(p) @@ -407,9 +409,9 @@ core.register_chatcommand("teleport", { return false, "You don't have permission to teleport other players (missing bring privilege)" end - local teleportee = nil - local p = {} - local teleportee_name = nil + teleportee = nil + p = {} + local teleportee_name teleportee_name, p.x, p.y, p.z = param:match( "^([^ ]+) +([%d.-]+)[, ] *([%d.-]+)[, ] *([%d.-]+)$") p.x, p.y, p.z = tonumber(p.x), tonumber(p.y), tonumber(p.z) @@ -422,10 +424,8 @@ core.register_chatcommand("teleport", { .. " to " .. core.pos_to_string(p) end - local teleportee = nil - local p = nil - local teleportee_name = nil - local target_name = nil + teleportee = nil + p = nil teleportee_name, target_name = string.match(param, "^([^ ]+) +([^ ]+)$") if teleportee_name then teleportee = core.get_player_by_name(teleportee_name) @@ -459,7 +459,8 @@ core.register_chatcommand("set", { core.settings:set(setname, setvalue) return true, setname .. " = " .. setvalue end - local setname, setvalue = string.match(param, "([^ ]+) (.+)") + + setname, setvalue = string.match(param, "([^ ]+) (.+)") if setname and setvalue then if not core.settings:get(setname) then return false, "Failed. Use '/set -n <name> <value>' to create a new setting." @@ -467,14 +468,16 @@ core.register_chatcommand("set", { core.settings:set(setname, setvalue) return true, setname .. " = " .. setvalue end - local setname = string.match(param, "([^ ]+)") + + setname = string.match(param, "([^ ]+)") if setname then - local setvalue = core.settings:get(setname) + setvalue = core.settings:get(setname) if not setvalue then setvalue = "<not set>" end return true, setname .. " = " .. setvalue end + return false, "Invalid parameters (see /help set)." end, }) @@ -692,7 +695,7 @@ core.register_chatcommand("pulverize", { end core.log("action", name .. " pulverized \"" .. wielded_item:get_name() .. " " .. wielded_item:get_count() .. "\"") - player:set_wielded_item(nil) + player:set_wielded_item(nil) return true, "An item was pulverized." end, }) @@ -771,7 +774,7 @@ core.register_chatcommand("rollback", { end local target_name, seconds = string.match(param, ":([^ ]+) *(%d*)") if not target_name then - local player_name = nil + local player_name player_name, seconds = string.match(param, "([^ ]+) *(%d*)") if not player_name then return false, "Invalid parameters. See /help rollback" diff --git a/builtin/game/forceloading.lua b/builtin/game/forceloading.lua index 5de4c3ad3..e1e00920c 100644 --- a/builtin/game/forceloading.lua +++ b/builtin/game/forceloading.lua @@ -111,7 +111,7 @@ end -- periodical forceload persistence local function periodically_persist_forceloaded_blocks() - + -- only persist if the blocks actually changed if forceload_blocks_changed then persist_forceloaded_blocks() diff --git a/builtin/game/item.lua b/builtin/game/item.lua index 7855880f8..8041d557e 100644 --- a/builtin/game/item.lua +++ b/builtin/game/item.lua @@ -206,7 +206,6 @@ function core.get_node_drops(node, toolname) -- Extended drop table local got_items = {} local got_count = 0 - local _, item, tool for _, item in ipairs(drop.items) do local good_rarity = true local good_tool = true @@ -614,15 +613,10 @@ function core.node_dig(pos, node, digger) end -- Run script hook - local _, callback for _, callback in ipairs(core.registered_on_dignodes) do local origin = core.callback_origins[callback] if origin then core.set_last_run_mod(origin.mod) - --print("Running " .. tostring(callback) .. - -- " (a " .. origin.name .. " callback in " .. origin.mod .. ")") - else - --print("No data associated with callback") end -- Copy pos and node because callback can modify them diff --git a/builtin/game/misc.lua b/builtin/game/misc.lua index e6d16dde7..02c36ccb1 100644 --- a/builtin/game/misc.lua +++ b/builtin/game/misc.lua @@ -62,7 +62,7 @@ end core.register_on_joinplayer(function(player) local player_name = player:get_player_name() player_list[player_name] = player - if not minetest.is_singleplayer() then + if not core.is_singleplayer() then local status = core.get_server_status(player_name, true) if status and status ~= "" then core.chat_send_player(player_name, status) diff --git a/builtin/game/privileges.lua b/builtin/game/privileges.lua index d77a481ac..c7417d2f4 100644 --- a/builtin/game/privileges.lua +++ b/builtin/game/privileges.lua @@ -18,7 +18,7 @@ function core.register_privilege(name, param) def.description = "(no description)" end end - local def = {} + local def if type(param) == "table" then def = param else diff --git a/builtin/game/register.lua b/builtin/game/register.lua index 51492e928..478139be3 100644 --- a/builtin/game/register.lua +++ b/builtin/game/register.lua @@ -303,7 +303,6 @@ end -- Alias the forbidden item names to "" so they can't be -- created via itemstrings (e.g. /give) -local name for name in pairs(forbidden_item_names) do core.registered_aliases[name] = "" register_alias_raw(name, "") @@ -363,9 +362,9 @@ core.register_node(":ignore", { drop = "", groups = {not_in_creative_inventory=1}, on_place = function(itemstack, placer, pointed_thing) - minetest.chat_send_player( + core.chat_send_player( placer:get_player_name(), - minetest.colorize("#FF0000", + core.colorize("#FF0000", "You can't place 'ignore' nodes!")) return "" end, @@ -413,10 +412,6 @@ function core.run_callbacks(callbacks, mode, ...) local origin = core.callback_origins[callbacks[i]] if origin then core.set_last_run_mod(origin.mod) - --print("Running " .. tostring(callbacks[i]) .. - -- " (a " .. origin.name .. " callback in " .. origin.mod .. ")") - else - --print("No data associated with callback") end local cb_ret = callbacks[i](...) @@ -537,7 +532,7 @@ end core.registered_on_player_hpchanges = { modifiers = { }, loggers = { } } function core.registered_on_player_hpchange(player, hp_change, reason) - local last = false + local last for i = #core.registered_on_player_hpchanges.modifiers, 1, -1 do local func = core.registered_on_player_hpchanges.modifiers[i] hp_change, last = func(player, hp_change, reason) diff --git a/builtin/game/statbars.lua b/builtin/game/statbars.lua index bb88356d5..46c947b60 100644 --- a/builtin/game/statbars.lua +++ b/builtin/game/statbars.lua @@ -1,8 +1,7 @@ -- cache setting local enable_damage = core.settings:get_bool("enable_damage") -local health_bar_definition = -{ +local health_bar_definition = { hud_elem_type = "statbar", position = { x=0.5, y=1 }, text = "heart.png", @@ -12,8 +11,7 @@ local health_bar_definition = offset = { x=(-10*24)-25, y=-(48+24+16)}, } -local breath_bar_definition = -{ +local breath_bar_definition = { hud_elem_type = "statbar", position = { x=0.5, y=1 }, text = "bubble.png", @@ -30,8 +28,8 @@ local function scaleToDefault(player, field) local current = player["get_" .. field](player) local nominal = core["PLAYER_MAX_".. field:upper() .. "_DEFAULT"] local max_display = math.max(nominal, - math.max(player:get_properties()[field .. "_max"], current)) - return current / max_display * nominal + math.max(player:get_properties()[field .. "_max"], current)) + return current / max_display * nominal end local function update_builtin_statbars(player) @@ -53,8 +51,8 @@ local function update_builtin_statbars(player) local immortal = player:get_armor_groups().immortal == 1 if flags.healthbar and enable_damage and not immortal then local number = scaleToDefault(player, "hp") - if hud.id_healthbar == nil then - local hud_def = table.copy(health_bar_definition) + if hud.id_healthbar == nil then + local hud_def = table.copy(health_bar_definition) hud_def.number = number hud.id_healthbar = player:hud_add(hud_def) else @@ -70,7 +68,7 @@ local function update_builtin_statbars(player) player:get_breath() < breath_max then local number = 2 * scaleToDefault(player, "breath") if hud.id_breathbar == nil then - local hud_def = table.copy(breath_bar_definition) + local hud_def = table.copy(breath_bar_definition) hud_def.number = number hud.id_breathbar = player:hud_add(hud_def) else @@ -125,14 +123,14 @@ local function player_event_handler(player,eventname) return false end -function core.hud_replace_builtin(name, definition) +function core.hud_replace_builtin(hud_name, definition) if type(definition) ~= "table" or definition.hud_elem_type ~= "statbar" then return false end - if name == "health" then + if hud_name == "health" then health_bar_definition = definition for name, ids in pairs(hud_ids) do @@ -146,7 +144,7 @@ function core.hud_replace_builtin(name, definition) return true end - if name == "breath" then + if hud_name == "breath" then breath_bar_definition = definition for name, ids in pairs(hud_ids) do |