From 71cfa67c7dd2e73f828d97a17b4afa96c0b37551 Mon Sep 17 00:00:00 2001 From: Johannes Fritz Date: Tue, 23 Aug 2022 10:11:21 -0500 Subject: [PATCH] Fix wieldview in MT 5.6 --- mods/PLAYER/mcl_wieldview/init.lua | 74 +++++++++++++++++------------- 1 file changed, 42 insertions(+), 32 deletions(-) diff --git a/mods/PLAYER/mcl_wieldview/init.lua b/mods/PLAYER/mcl_wieldview/init.lua index b9d5c8cb1..3a646a18a 100644 --- a/mods/PLAYER/mcl_wieldview/init.lua +++ b/mods/PLAYER/mcl_wieldview/init.lua @@ -1,54 +1,64 @@ -minetest.register_on_joinplayer(function(player) - if not player or not player:is_player() then - return - end - local itementity = minetest.add_entity(player:get_pos(), "mcl_wieldview:wieldnode") - if not itementity then return end - itementity:set_attach(player, "Wield_Item") - --itementity:set_attach(player, "Hand_Right", vector.new(0, 1, 0), vector.new(90, 45, 90)) - itementity:get_luaentity()._wielder = player -end) - -minetest.register_entity("mcl_wieldview:wieldnode", { +minetest.register_entity("mcl_wieldview:wieldview", { initial_properties = { hp_max = 1, visual = "wielditem", physical = false, - textures = {""}, - automatic_rotate = 1.5, - is_visible = true, + is_visible = false, pointable = false, collide_with_objects = false, static_save = false, collisionbox = {-0.21, -0.21, -0.21, 0.21, 0.21, 0.21}, selectionbox = {-0.21, -0.21, -0.21, 0.21, 0.21, 0.21}, visual_size = {x = 0.21, y = 0.21}, - }, - - on_step = function(self) - local player = self._wielder - - if not player or not player:is_player() then - self.object:remove() - return - end - + } +}) + +local wieldview_luaentites = {} + +local function update_wieldview_entity(player) + local luaentity = wieldview_luaentites[player] + if luaentity and luaentity.object:get_yaw() then local item = player:get_wielded_item():get_name() - if item == self._item then return end - - self._item = item + if item == luaentity._item then return end + luaentity._item = item + local def = player:get_wielded_item():get_definition() if def and def._mcl_wieldview_item then item = def._mcl_wieldview_item end - + local item_def = minetest.registered_items[item] - self.object:set_properties({ + luaentity.object:set_properties({ glow = item_def and item_def.light_source or 0, wield_item = item, is_visible = item ~= "" }) - end, -}) + else + -- If the player is running through an unloaded area, + -- the wieldview entity will sometimes get unloaded. + -- This code path is also used to initalize the wieldview. + -- Creating entites from minetest.register_on_joinplayer + -- is unreliable as of Minetest 5.6 + local obj_ref = minetest.add_entity(player:get_pos(), "mcl_wieldview:wieldview") + if not obj_ref then return end + obj_ref:set_attach(player, "Wield_Item") + --obj_ref:set_attach(player, "Hand_Right", vector.new(0, 1, 0), vector.new(90, 45, 90)) + wieldview_luaentites[player] = obj_ref:get_luaentity() + end +end + +minetest.register_on_leaveplayer(function(player) + if wieldview_luaentites[player] then + wieldview_luaentites[player].object:remove() + end + wieldview_luaentites[player] = nil +end) + +minetest.register_globalstep(function(dtime) + local players = minetest.get_connected_players() + for i, player in pairs(players) do + update_wieldview_entity(player) + end +end)