ExpandingDev
/
MineClone2
forked from VoxeLibre/VoxeLibre
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

No replace empty bottle if used on src in creative

This commit is contained in:
Wuzzy 2019-02-09 00:05:00 +01:00
parent 5b0945b88c
commit 986871f2b5
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mods/ITEMS/mcl_potions/init.lua
View File

@ -38,12 +38,14 @@ minetest.register_craftitem("mcl_potions:glass_bottle", {
-- Try to fill glass bottle with water -- Try to fill glass bottle with water
local get_water = false local get_water = false
local from_liquid_source = false
local river_water = false local river_water = false
if not def then if not def then
-- Unknown node: no-op -- Unknown node: no-op
elseif def.groups and def.groups.water and def.liquidtype == "source" then elseif def.groups and def.groups.water and def.liquidtype == "source" then
-- Water source -- Water source
get_water = true get_water = true
from_liquid_source = true
river_water = node.name == "mclx_core:river_water_source" river_water = node.name == "mclx_core:river_water_source"
-- Or reduce water level of cauldron by 1 -- Or reduce water level of cauldron by 1
elseif string.sub(node.name, 1, 14) == "mcl_cauldrons:" then elseif string.sub(node.name, 1, 14) == "mcl_cauldrons:" then
@ -76,7 +78,8 @@ minetest.register_craftitem("mcl_potions:glass_bottle", {
end end
end end
if get_water then if get_water then
if minetest.settings:get_bool("creative_mode") ~= true then local creative = minetest.settings:get_bool("creative_mode") == true
if from_liquid_source or creative then
-- Replace with water bottle, if possible, otherwise -- Replace with water bottle, if possible, otherwise
-- place the water potion at a place where's space -- place the water potion at a place where's space
local water_bottle local water_bottle
@ -85,10 +88,15 @@ minetest.register_craftitem("mcl_potions:glass_bottle", {
else else
water_bottle = ItemStack("mcl_potions:potion_water") water_bottle = ItemStack("mcl_potions:potion_water")
end end
if itemstack:get_count() == 1 then local inv = placer:get_inventory()
if creative then
-- Don't replace empty bottle in creative for convenience reasons
if not inv:contains_item("main", water_bottle) then
inv:add_item("main", water_bottle)
end
elseif itemstack:get_count() == 1 then
return water_bottle return water_bottle
else else
local inv = placer:get_inventory()
if inv:room_for_item("main", water_bottle) then if inv:room_for_item("main", water_bottle) then
inv:add_item("main", water_bottle) inv:add_item("main", water_bottle)
else else