nalc/nalc_game
1
0
Fork 1
forked from minetest/minetest_game
Code Issues Pull Requests Releases Wiki Activity

Use creative.is_enabled_for for creative mode if possible (#1558)

Browse Source
This commit is contained in:
zaoqi
2017-03-29 21:02:26 +02:00
committed by SmallJoker
parent b847888cb7
commit 077316b4cd
13 changed files with 34 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mods/carts/cart_entity.lua
View File

@ -92,7 +92,8 @@ function cart_entity:on_punch(puncher, time_from_last_punch, tool_capabilities,
end
-- Pick up cart
local inv = puncher:get_inventory()
if not minetest.setting_getbool("creative_mode")
if not (creative and creative.is_enabled_for
+ and creative.is_enabled_for(puncher:get_player_name()))
or not inv:contains_item("main", "carts:cart") then
local leftover = inv:add_item("main", "carts:cart")
-- If no room in inventory add a replacement cart to the world
@ -385,7 +386,8 @@ minetest.register_craftitem("carts:cart", {
minetest.sound_play({name = "default_place_node_metal", gain = 0.5},
{pos = pointed_thing.above})
if not minetest.setting_getbool("creative_mode") then
if not (creative and creative.is_enabled_for
and creative.is_enabled_for(placer:get_player_name())) then
itemstack:take_item()
end
return itemstack