epCode
/
MineClone2
forked from VoxeLibre/VoxeLibre
2
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

master #5

Merged
epCode merged 255 commits from VoxeLibre/VoxeLibre:master into master 2021-02-02 23:20:01 +01:00
Conversation 0 Commits 255 Files Changed 165 +6 -6
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c36dc16527 - Show all commits

10
mods/ENTITIES/mcl_item_entity/init.lua
View File

@ -297,9 +297,9 @@ function minetest.handle_node_drops(pos, drops, digger)
* true: Drop itself when dug by shears / silk touch tool * true: Drop itself when dug by shears / silk touch tool
* table: Drop every itemstring in this table when dug by shears _mcl_silk_touch_drop * table: Drop every itemstring in this table when dug by shears _mcl_silk_touch_drop
]] ]]
local enchantments = tool and mcl_enchanting.get_enchantments(tool, "silk_touch") local enchantments = tool and mcl_enchanting.get_enchantments(tool, "silk_touch")
local silk_touch_drop = false local silk_touch_drop = false
local nodedef = minetest.registered_nodes[dug_node.name] local nodedef = minetest.registered_nodes[dug_node.name]
if toolcaps ~= nil and toolcaps.groupcaps and toolcaps.groupcaps.shearsy_dig and nodedef._mcl_shears_drop then if toolcaps ~= nil and toolcaps.groupcaps and toolcaps.groupcaps.shearsy_dig and nodedef._mcl_shears_drop then
@ -316,7 +316,7 @@ function minetest.handle_node_drops(pos, drops, digger)
drops = nodedef._mcl_silk_touch_drop drops = nodedef._mcl_silk_touch_drop
end end
end end
if tool and nodedef._mcl_fortune_drop and enchantments.fortune then if tool and nodedef._mcl_fortune_drop and enchantments.fortune then
local fortune_level = enchantments.fortune local fortune_level = enchantments.fortune
local fortune_drop = nodedef._mcl_fortune_drop local fortune_drop = nodedef._mcl_fortune_drop
@ -331,7 +331,7 @@ function minetest.handle_node_drops(pos, drops, digger)
end end
else else
-- Fixed Behavior -- Fixed Behavior
local drop = get_fortune_drops(fortune_drops, fortune_level) local drop = get_fortune_drops(fortune_drop, fortune_level)
drops = get_drops(drop, tool:get_name(), dug_node.param2, nodedef.paramtype2) drops = get_drops(drop, tool:get_name(), dug_node.param2, nodedef.paramtype2)
end end
end end
@ -342,7 +342,7 @@ function minetest.handle_node_drops(pos, drops, digger)
mcl_experience.throw_experience(pos, experience_amount) mcl_experience.throw_experience(pos, experience_amount)
end end
end end
for _,item in ipairs(drops) do for _,item in ipairs(drops) do
local count local count
if type(item) == "string" then if type(item) == "string" then

2
mods/ITEMS/mcl_core/nodes_base.lua
View File

@ -503,7 +503,7 @@ minetest.register_node("mcl_core:gravel", {
{items = {'mcl_core:gravel'}} {items = {'mcl_core:gravel'}}
} }
}, },
[3] = "mcl_core:flint" [3] = "mcl_core:flint",
}, },
}) })