Merge remote-tracking branch 'upstream/master'

Mark pickup sound as ephemeral
2021-09-21 23:00:00 +02:00 · 2021-09-02 23:42:56 +02:00 · 2020-09-28 20:52:45 +02:00 · 2020-09-27 19:15:57 +02:00
1 changed files with 2 additions and 2 deletions
--- a/init.lua
+++ b/init.lua
@ -99,7 +99,7 @@ if legacy_setting_getbool("item_drop.enable_item_pickup",
 		minetest.sound_play("item_drop_pickup", {
 			pos = pos,
 			gain = pickup_gain,
-		})
+		}, true)
 		if pickup_particle then
 			local item = minetest.registered_nodes[
 				ent.itemstring:gsub("(.*)%s.*$", "%1")]
@ -378,7 +378,7 @@ and not minetest.settings:get_bool("creative_mode") then

 	local old_handle_node_drops = minetest.handle_node_drops
 	function minetest.handle_node_drops(pos, drops, player)
-		if player.is_fake_player then
+		if not player or player.is_fake_player then
 			-- Node Breaker or similar machines should receive items in the
 			-- inventory
 			return old_handle_node_drops(pos, drops, player)
Author	SHA1	Message	Date
sys4	cae46704eb	Merge remote-tracking branch 'upstream/master'	2021-09-21 23:00:00 +02:00
sfan5	d19d00d690	Mark pickup sound as ephemeral	2021-09-02 23:42:56 +02:00
sys4	900614a74c	Merge remote-tracking branch 'upstream/master'	2020-09-28 20:52:45 +02:00
HybridDog	1545f82cb7	Fix error for 'nil' player in minetest.handle_node_drops (#36 )	2020-09-27 19:15:57 +02:00