From c350b5158b7e47358f07141ac72b2f188ac171ce Mon Sep 17 00:00:00 2001 From: NO11 Date: Wed, 9 Jun 2021 18:31:21 +0000 Subject: [PATCH 1/4] Fix #1795 (Don't remove Pumpkin HUD when it is removed on death if keepinventory is enabled) --- mods/ITEMS/mcl_farming/pumpkin.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mods/ITEMS/mcl_farming/pumpkin.lua b/mods/ITEMS/mcl_farming/pumpkin.lua index b183c14326..bd0d59a126 100644 --- a/mods/ITEMS/mcl_farming/pumpkin.lua +++ b/mods/ITEMS/mcl_farming/pumpkin.lua @@ -162,7 +162,9 @@ if minetest.get_modpath("mcl_armor") then end end) minetest.register_on_dieplayer(function(player) - remove_pumpkin_hud(player) + if minetest.settings:get("mcl_keepInventory") ~= "true" then + remove_pumpkin_hud(player) + end end) minetest.register_on_leaveplayer(function(player) pumpkin_hud[player] = nil From 3577585d7415552943d45f2009eed0f3ae379708 Mon Sep 17 00:00:00 2001 From: NO11 Date: Thu, 10 Jun 2021 15:34:57 +0000 Subject: [PATCH 2/4] Use get_bool --- mods/ITEMS/mcl_farming/pumpkin.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ITEMS/mcl_farming/pumpkin.lua b/mods/ITEMS/mcl_farming/pumpkin.lua index bd0d59a126..5ae5f80bcf 100644 --- a/mods/ITEMS/mcl_farming/pumpkin.lua +++ b/mods/ITEMS/mcl_farming/pumpkin.lua @@ -162,7 +162,7 @@ if minetest.get_modpath("mcl_armor") then end end) minetest.register_on_dieplayer(function(player) - if minetest.settings:get("mcl_keepInventory") ~= "true" then + if not minetest.settings:get_bool("mcl_keepInventory") then remove_pumpkin_hud(player) end end) From eafb1a2797b547710a4fad70d9339e92ca9085ef Mon Sep 17 00:00:00 2001 From: NO11 Date: Sat, 12 Jun 2021 17:23:03 +0000 Subject: [PATCH 3/4] Use add_particle instead of minetest.add_particlespawner for elytra rocket particles --- mods/PLAYER/mcl_playerplus/init.lua | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/mods/PLAYER/mcl_playerplus/init.lua b/mods/PLAYER/mcl_playerplus/init.lua index fc8dbcd514..1e1354ae0d 100644 --- a/mods/PLAYER/mcl_playerplus/init.lua +++ b/mods/PLAYER/mcl_playerplus/init.lua @@ -189,22 +189,15 @@ minetest.register_globalstep(function(dtime) if vector.length(player_velocity) < 40 then local add_velocity = player.add_velocity or player.add_player_velocity add_velocity(player, vector.multiply(player:get_look_dir(), 4)) - minetest.add_particlespawner({ - amount = 1, - time = 0.1, - minpos = fly_pos, - maxpos = fly_pos, - minvel = {x = 0, y = 0, z = 0}, - maxvel = {x = 0, y = 0, z = 0}, - minacc = {x = 0, y = 0, z = 0}, - maxacc = {x = 0, y = 0, z = 0}, - minexptime = 0.3, - maxexptime = 0.5, - minsize = 1, - maxsize = 2.5, + add_particle({ + pos = fly_pos, + velocity = {x = 0, y = 0, z = 0}, + acceleration = {x = 0, y = 0, z = 0}, + expirationtime = math.random(0.3, 0.5), + size = math.random(1, 2), collisiondetection = false, vertical = false, - texture = "mcl_particles_crit.png^[colorize:#bc7a57:127", + texture = "mcl_particles_bonemeal.png^[colorize:#bc7a57:127", glow = 5, }) end From 822071c66b30d9a1da3ae810d038bebdb65e101c Mon Sep 17 00:00:00 2001 From: basxto Date: Sat, 12 Jun 2021 18:35:48 +0000 Subject: [PATCH 4/4] Fix attribution and typo Since walking skeleton is based on another cc-by 3.0 work, it's also required to mention the original author --- mods/ENTITIES/mobs_mc/LICENSE-media.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mods/ENTITIES/mobs_mc/LICENSE-media.md b/mods/ENTITIES/mobs_mc/LICENSE-media.md index dad31abb85..3bfe70a151 100644 --- a/mods/ENTITIES/mobs_mc/LICENSE-media.md +++ b/mods/ENTITIES/mobs_mc/LICENSE-media.md @@ -190,9 +190,10 @@ Origin of those models: * [Spennnyyy](https://freesound.org/people/Spennnyyy/) (CC0) * `mcl_totems_totem.ogg` * Source: -* [Baŝto](https://opengameart.org/users/ba%C5%9Dto) +* [Baŝto](https://opengameart.org/users/ba%C5%9Dto) (remixer) and [kantouth](https://freesound.org/people/kantouth/) (original author) * `mobs_mc_skeleton_random.*.ogg` (CC BY 3.0) * Source: + * Based on: * [spookymodem](https://freesound.org/people/spookymodem/) * `mobs_mc_skeleton_death.ogg` (CC0) * @@ -306,4 +307,4 @@ Origin of those models: Note: Many of these sounds have been more or less modified to fit the game. -Sounds not mentioned hre are licensed under CC0. +Sounds not mentioned here are licensed under CC0.