nalc/farming
1
0
Fork 0
forked from mtcontrib/farming
Code Issues Pull Requests Releases Wiki Activity

added player checks for crop placement

Browse Source
This commit is contained in:
TenPlus1 2018-06-19 18:36:00 +01:00
parent 8a4ca846d9
commit 1018a558d2
5 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api.txt
View File

@ -40,7 +40,6 @@ The farming API allows you to easily register plants and hoes.
Note: Any crops registered with the above function will use the new growing routines, also if crops are manually added with the {growing=1} group they will also grow.
### Crop functions
If a mod registers nodes to be used as crops using the {growing=1} group then an additional function can be used for custom growth checks instead of the standard 'are we above wet soil'.

9
crops/beans.lua
View File

@ -27,12 +27,15 @@ local function place_beans(itemstack, placer, pointed_thing, plantname)
-- am I right-clicking on something that has a custom on_place set?
-- thanks to Krock for helping with this issue :)
local def = minetest.registered_nodes[under.name]
if def and def.on_rightclick then
if placer and def and def.on_rightclick then
return def.on_rightclick(pt.under, under, placer, itemstack)
end
-- is player planting crop?
local name = placer:get_player_name() or ""
-- check for protection
if minetest.is_protected(pt.under, placer:get_player_name()) then
if minetest.is_protected(pt.under, name) then
return
end
@ -46,7 +49,7 @@ local function place_beans(itemstack, placer, pointed_thing, plantname)
minetest.sound_play("default_place_node", {pos = pt.under, gain = 1.0})
if not farming.is_creative(placer:get_player_name()) then
if placer or not farming.is_creative(placer:get_player_name()) then
itemstack:take_item()

9
crops/cocoa.lua
View File

@ -21,7 +21,7 @@ local function place_cocoa(itemstack, placer, pointed_thing, plantname)
-- am I right-clicking on something that has a custom on_place set?
-- thanks to Krock for helping with this issue :)
local def = minetest.registered_nodes[under.name]
if def and def.on_rightclick then
if placer and def and def.on_rightclick then
return def.on_rightclick(pt.under, under, placer, itemstack)
end
@ -31,8 +31,11 @@ local function place_cocoa(itemstack, placer, pointed_thing, plantname)
return
end
-- is player planting crop?
local name = placer:get_player_name() or ""
-- check for protection
if minetest.is_protected(pt.above, placer:get_player_name()) then
if minetest.is_protected(pt.above, name) then
return
end
@ -41,7 +44,7 @@ local function place_cocoa(itemstack, placer, pointed_thing, plantname)
minetest.sound_play("default_place_node", {pos = pt.above, gain = 1.0})
if not farming.is_creative(placer:get_player_name()) then
if placer and not farming.is_creative(placer:get_player_name()) then
itemstack:take_item()

9
crops/grapes.lua
View File

@ -22,12 +22,15 @@ local function place_grapes(itemstack, placer, pointed_thing, plantname)
-- am I right-clicking on something that has a custom on_place set?
-- thanks to Krock for helping with this issue :)
local def = minetest.registered_nodes[under.name]
if def and def.on_rightclick then
if placer and def and def.on_rightclick then
return def.on_rightclick(pt.under, under, placer, itemstack)
end
-- is player planting seed?
local name = placer:get_player_name() or ""
-- check for protection
if minetest.is_protected(pt.under, placer:get_player_name()) then
if minetest.is_protected(pt.under, name) then
return
end
@ -41,7 +44,7 @@ local function place_grapes(itemstack, placer, pointed_thing, plantname)
minetest.sound_play("default_place_node", {pos = pt.under, gain = 1.0})
if not farming.is_creative(placer:get_player_name()) then
if placer and not farming.is_creative(placer:get_player_name()) then
itemstack:take_item()

9
init.lua
View File

@ -419,7 +419,7 @@ function farming.place_seed(itemstack, placer, pointed_thing, plantname)
-- am I right-clicking on something that has a custom on_place set?
-- thanks to Krock for helping with this issue :)
local def = minetest.registered_nodes[under.name]
if def and def.on_rightclick then
if placer and def and def.on_rightclick then
return def.on_rightclick(pt.under, under, placer, itemstack)
end
@ -444,8 +444,11 @@ function farming.place_seed(itemstack, placer, pointed_thing, plantname)
return
end
-- is player planting seed?
local name = placer:get_player_name() or ""
-- if not protected then add node and remove 1 item from the itemstack
if not minetest.is_protected(pt.above, placer:get_player_name()) then
if not minetest.is_protected(pt.above, name) then
local p2 = minetest.registered_nodes[plantname].place_param2 or 1
@ -455,7 +458,7 @@ function farming.place_seed(itemstack, placer, pointed_thing, plantname)
minetest.sound_play("default_place_node", {pos = pt.above, gain = 1.0})
if not placer or not farming.is_creative(placer:get_player_name()) then
if placer and not farming.is_creative(placer:get_player_name()) then
local name = itemstack:get_name()