From 589bc4e5a4e34014efed7604d3f21e4fb862764f Mon Sep 17 00:00:00 2001 From: nixnoxus Date: Tue, 26 Apr 2022 16:35:41 +0200 Subject: [PATCH] default.log_player_action doesn't insert " at " before position --- game_api.txt | 2 +- mods/default/functions.lua | 8 ++++---- mods/default/nodes.lua | 2 +- mods/default/trees.lua | 2 +- mods/farming/api.lua | 2 +- mods/tnt/init.lua | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/game_api.txt b/game_api.txt index 2bbd8da6..87be5294 100644 --- a/game_api.txt +++ b/game_api.txt @@ -1136,7 +1136,7 @@ the log. * `player` The player who performed the action * `message_parts` Any mumber of message parts describing the action in 3rd person singular present tense. It can also - contain a `vector` which is logged as " at (X,Y,Z)" + contain a `vector` which is logged as "(X,Y,Z)" `default.set_inventory_action_loggers(def, name)` diff --git a/mods/default/functions.lua b/mods/default/functions.lua index f62ec599..427c56b8 100644 --- a/mods/default/functions.lua +++ b/mods/default/functions.lua @@ -737,7 +737,7 @@ function default.log_player_action(player, ...) and player.is_fake_player or "*").. ")" end for _, v in ipairs({...}) do - msg = msg .. " " .. (is_vector(v) and ("at " .. minetest.pos_to_string(v)) or v) + msg = msg .. " " .. (is_vector(v) and minetest.pos_to_string(v) or v) end minetest.log("action", msg) end @@ -745,13 +745,13 @@ end function default.set_inventory_action_loggers(def, name) def.on_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player) - default.log_player_action(player, "moves stuff in", name, pos) + default.log_player_action(player, "moves stuff in", name, "at", pos) end def.on_metadata_inventory_put = function(pos, listname, index, stack, player) - default.log_player_action(player, "moves", stack:get_name(), "to", name, pos) + default.log_player_action(player, "moves", stack:get_name(), "to", name, "at", pos) end def.on_metadata_inventory_take = function(pos, listname, index, stack, player) - default.log_player_action(player, "takes", stack:get_name(), "from", name, pos) + default.log_player_action(player, "takes", stack:get_name(), "from", name, "at", pos) end end diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua index 45275176..269c578c 100644 --- a/mods/default/nodes.lua +++ b/mods/default/nodes.lua @@ -2602,7 +2602,7 @@ local function register_sign(material, desc, def) return end default.log_player_action(sender, "wrote \"" .. text .. - "\" to the sign", pos) + "\" to the sign at", pos) local meta = minetest.get_meta(pos) meta:set_string("text", text) diff --git a/mods/default/trees.lua b/mods/default/trees.lua index 630d0b70..24a96cf0 100644 --- a/mods/default/trees.lua +++ b/mods/default/trees.lua @@ -572,7 +572,7 @@ function default.sapling_on_place(itemstack, placer, pointed_thing, return itemstack end - default.log_player_action(placer, "places node", sapling_name, pos) + default.log_player_action(placer, "places node", sapling_name, "at", pos) local take_item = not minetest.is_creative_enabled(player_name) local newnode = {name = sapling_name} diff --git a/mods/farming/api.lua b/mods/farming/api.lua index a6d94a66..c892a779 100644 --- a/mods/farming/api.lua +++ b/mods/farming/api.lua @@ -178,7 +178,7 @@ farming.place_seed = function(itemstack, placer, pointed_thing, plantname) end -- add the node and remove 1 item from the itemstack - default.log_player_action(placer, "places node", plantname, pt.above) + default.log_player_action(placer, "places node", plantname, "at", pt.above) minetest.add_node(pt.above, {name = plantname, param2 = 1}) tick(pt.above) if not minetest.is_creative_enabled(player_name) then diff --git a/mods/tnt/init.lua b/mods/tnt/init.lua index 71655b3c..d8864cd5 100644 --- a/mods/tnt/init.lua +++ b/mods/tnt/init.lua @@ -465,7 +465,7 @@ minetest.register_node("tnt:gunpowder", { on_punch = function(pos, node, puncher) if puncher:get_wielded_item():get_name() == "default:torch" then minetest.set_node(pos, {name = "tnt:gunpowder_burning"}) - default.log_player_action(puncher, "ignites tnt:gunpowder", pos) + default.log_player_action(puncher, "ignites tnt:gunpowder at", pos) end end, on_blast = function(pos, intensity) @@ -633,7 +633,7 @@ function tnt.register_tnt(def) if puncher:get_wielded_item():get_name() == "default:torch" then minetest.swap_node(pos, {name = name .. "_burning"}) minetest.registered_nodes[name .. "_burning"].on_construct(pos) - default.log_player_action(puncher, "ignites", node.name, pos) + default.log_player_action(puncher, "ignites", node.name, "at", pos) end end, on_blast = function(pos, intensity)