balazsszalab
/
MineClone5
forked from MineClone5/MineClone5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://git.minetest.land/Wuzzy/MineClone2

This commit is contained in:
Brandon 2020-08-02 20:51:27 -04:00
parent 67e4e814f4 125840c9e4
commit 4c05c2e70c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mods/ITEMS/mcl_beds/functions.lua
View File

@ -364,7 +364,7 @@ end)
minetest.register_on_leaveplayer(function(player) minetest.register_on_leaveplayer(function(player)
local name = player:get_player_name() local name = player:get_player_name()
lay_down(player, nil, nil, false, true) lay_down(player, nil, nil, false, true)
players = minetest.get_connected_players() local players = minetest.get_connected_players()
for n, player in ipairs(players) do for n, player in ipairs(players) do
if player:get_player_name() == name then if player:get_player_name() == name then
players[n] = nil players[n] = nil

4
mods/ITEMS/mcl_buckets/init.lua
View File

@ -221,7 +221,7 @@ minetest.register_craftitem("mcl_buckets:bucket_empty", {
-- Fill bucket, but not in Creative Mode -- Fill bucket, but not in Creative Mode
if not minetest.is_creative_enabled(user:get_player_name()) then if not minetest.is_creative_enabled(user:get_player_name()) then
new_bucket = ItemStack({name = liquiddef.itemname, metadata = tostring(node.param2)}) new_bucket = ItemStack({name = liquiddef.itemname})
end end
minetest.add_node(pointed_thing.under, {name="air"}) minetest.add_node(pointed_thing.under, {name="air"})
@ -274,7 +274,7 @@ minetest.register_craftitem("mcl_buckets:bucket_empty", {
local new_bucket local new_bucket
if liquiddef ~= nil and liquiddef.itemname ~= nil and (dropnode.name == liquiddef.source_take) then if liquiddef ~= nil and liquiddef.itemname ~= nil and (dropnode.name == liquiddef.source_take) then
-- Fill bucket -- Fill bucket
new_bucket = ItemStack({name = liquiddef.itemname, metadata = tostring(dropnode.param2)}) new_bucket = ItemStack({name = liquiddef.itemname})
sound_take(dropnode.name, droppos) sound_take(dropnode.name, droppos)
collect_liquid = true collect_liquid = true
end end