c29979
/
MineClone5
forked from MineClone5/MineClone5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make ender pearls collide on plants, too

This commit is contained in:
Wuzzy 2017-05-26 17:56:09 +02:00
parent 7e1f8fa7ba
commit 42224d9df6
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mods/ITEMS/mcl_throwing/throwable.lua
View File

@ -164,6 +164,7 @@ local pearl_on_step = function(self, dtime)
local pos = self.object:getpos() local pos = self.object:getpos()
pos.y = math.floor(pos.y) pos.y = math.floor(pos.y)
local node = minetest.get_node(pos) local node = minetest.get_node(pos)
local nn = node.name
local def = minetest.registered_nodes[node.name] local def = minetest.registered_nodes[node.name]
-- Destroy when hitting a solid node -- Destroy when hitting a solid node
@ -172,7 +173,8 @@ local pearl_on_step = function(self, dtime)
-- FIXME: This also means the player loses an ender pearl for throwing into unloaded areas -- FIXME: This also means the player loses an ender pearl for throwing into unloaded areas
if node.name == "ignore" then if node.name == "ignore" then
self.object:remove() self.object:remove()
elseif (def and def.walkable) or not def then -- Activate when hitting a solid node or a plant
elseif nn == "mcl_core:vine" or nn == "mcl_core:deadbush" or minetest.get_item_group(nn, "flower") ~= 0 or minetest.get_item_group(nn, "sapling") ~= 0 or minetest.get_item_group(nn, "plant") ~= 0 or minetest.get_item_group(nn, "mushroom") ~= 0 or (def and def.walkable) or not def then
local player = minetest.get_player_by_name(self._thrower) local player = minetest.get_player_by_name(self._thrower)
if player then if player then
-- Teleport and hurt player -- Teleport and hurt player