From f86cf37ac9663e89cfee7fdc3c5c22376925ec75 Mon Sep 17 00:00:00 2001 From: Elias Fleckenstein Date: Mon, 4 Jan 2021 13:30:30 +0100 Subject: [PATCH 1/3] Fix zombies sometimes just disappearing when dieing to fire --- mods/ENTITIES/mcl_burning/engine.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mods/ENTITIES/mcl_burning/engine.lua b/mods/ENTITIES/mcl_burning/engine.lua index 266aa791f..d7728f897 100644 --- a/mods/ENTITIES/mcl_burning/engine.lua +++ b/mods/ENTITIES/mcl_burning/engine.lua @@ -106,9 +106,10 @@ function mcl_burning.damage(obj) damage = 1 end local new_hp = hp - damage - obj:set_hp(new_hp) if health then luaentity.health = new_hp + else + obj:set_hp(new_hp) end end end From 269ebc2718bbfd715855f020db2783ba9f6417f5 Mon Sep 17 00:00:00 2001 From: Elias Fleckenstein Date: Mon, 4 Jan 2021 13:34:57 +0100 Subject: [PATCH 2/3] Fix Silk Touch drop of Top Snow --- mods/ITEMS/mcl_core/nodes_base.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ITEMS/mcl_core/nodes_base.lua b/mods/ITEMS/mcl_core/nodes_base.lua index 01dd2d365..3dedca209 100644 --- a/mods/ITEMS/mcl_core/nodes_base.lua +++ b/mods/ITEMS/mcl_core/nodes_base.lua @@ -1028,7 +1028,7 @@ for i=1,8 do drop = "mcl_throwing:snowball "..(i+1), _mcl_blast_resistance = 0.1, _mcl_hardness = 0.1, - _mcl_silk_touch_drop = true, + _mcl_silk_touch_drop = {"mcl_core:snow " .. (i+1)}, }) end From 507f2d872b9b266718b0d436671ae1e352910d91 Mon Sep 17 00:00:00 2001 From: Elias Fleckenstein Date: Mon, 4 Jan 2021 14:21:28 +0100 Subject: [PATCH 3/3] Fix #949 --- mods/ENTITIES/mcl_boats/init.lua | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/mods/ENTITIES/mcl_boats/init.lua b/mods/ENTITIES/mcl_boats/init.lua index 9d0e45557..dda6321f9 100644 --- a/mods/ENTITIES/mcl_boats/init.lua +++ b/mods/ENTITIES/mcl_boats/init.lua @@ -59,6 +59,15 @@ local boat = { _animation = 0, -- 0: not animated; 1: paddling forwards; -1: paddling forwards } +local function detach_player(player) + player:set_detach() + player:set_properties({visual_size = {x=1, y=1}}) + mcl_player.player_attached[player:get_player_name()] = false + mcl_player.player_set_animation(player, "stand" , 30) +end + +minetest.register_on_respawnplayer(detach_player) + function boat.on_rightclick(self, clicker) if not clicker or not clicker:is_player() then return @@ -66,10 +75,7 @@ function boat.on_rightclick(self, clicker) local name = clicker:get_player_name() if self._driver and clicker == self._driver then self._driver = nil - clicker:set_detach() - clicker:set_properties({visual_size = {x=1, y=1}}) - mcl_player.player_attached[name] = false - mcl_player.player_set_animation(clicker, "stand" , 30) + detach_player(clicker) local pos = clicker:get_pos() pos = {x = pos.x, y = pos.y + 0.2, z = pos.z} clicker:set_pos(pos)