mtcontrib/homedecor_modpack
1
0
Fork 2
mirror of https://github.com/mt-mods/homedecor_modpack.git synced 2024-12-23 00:20:17 +01:00
Code Issues Releases Wiki Activity

Fixed bucket overwrite inhibiting its role

Browse Source 
- Buckets couldn't be used to take default:water_source nor default:lava_source
   because the overwrite made in homdecor/exterior.lua replaced that way of
   working. This patch makes both well and sources work.
This commit is contained in:
LeMagnesium 2015-05-16 13:47:46 +02:00
parent 3b2dc854c9
commit 17e066b9b1
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
homedecor/exterior.lua
View File

@ -37,7 +37,7 @@ local bl1_sbox = {
local bl1_cbox = { local bl1_cbox = {
type = "fixed", type = "fixed",
fixed = { fixed = {
{-0.5, -0.5, -0.25, 1.5, 0, 0.5 }, {-0.5, -0.5, -0.25, 1.5, 0, 0.5 },
{-0.5, -0.5, 0.45, 1.5, 0.5, 0.5 }, {-0.5, -0.5, 0.45, 1.5, 0.5, 0.5 },
} }
@ -69,7 +69,7 @@ local bl2_sbox = {
local bl2_cbox = { local bl2_cbox = {
type = "fixed", type = "fixed",
fixed = { fixed = {
{-0.5, -0.5, -0.25, 1.5, 0, 0.5 }, {-0.5, -0.5, -0.25, 1.5, 0, 0.5 },
{-0.5, -0.5, 0.45, 1.5, 0.5, 0.5 }, {-0.5, -0.5, 0.45, 1.5, 0.5, 0.5 },
} }
@ -328,12 +328,13 @@ homedecor.register("well", {
}) })
if minetest.get_modpath("bucket") then if minetest.get_modpath("bucket") then
local original_bucket_on_use = minetest.registered_items["bucket:bucket_empty"].on_use
minetest.override_item("bucket:bucket_empty", { minetest.override_item("bucket:bucket_empty", {
on_use = function(itemstack, user, pointed_thing) on_use = function(itemstack, user, pointed_thing)
local wielditem = user:get_wielded_item() local wielditem = user:get_wielded_item()
local wieldname = itemstack:get_name() local wieldname = itemstack:get_name()
local inv = user:get_inventory() local inv = user:get_inventory()
if pointed_thing.type == "node" and minetest.get_node(pointed_thing.under).name == "homedecor:well" then if pointed_thing.type == "node" and minetest.get_node(pointed_thing.under).name == "homedecor:well" then
if inv:room_for_item("main", "bucket:bucket_water 1") then if inv:room_for_item("main", "bucket:bucket_water 1") then
wielditem:take_item() wielditem:take_item()
@ -342,9 +343,11 @@ if minetest.get_modpath("bucket") then
else else
minetest.chat_send_player(user:get_player_name(), "No room in your inventory to add a filled bucket!") minetest.chat_send_player(user:get_player_name(), "No room in your inventory to add a filled bucket!")
end end
return wielditem
else
return original_bucket_on_use(itemstack, user, pointed_thing)
end end
return wielditem end
end
}) })
end end