juddm
/
star_wars
forked from thunderdog1138/star_wars
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Boats: Prevent entering 'ignore' nodes" 

This reverts commit 7754555707.
Due to recent engine commit boats now collide with 'ignore' nodes.
This commit is contained in:
paramat 2018-02-26 18:47:18 +00:00
parent 280f1b1c39
commit 70d91bc64d
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mods/boats/init.lua
View File

@ -172,23 +172,15 @@ function boat.on_step(self, dtime)
local new_velo local new_velo
local new_acce = {x = 0, y = 0, z = 0} local new_acce = {x = 0, y = 0, z = 0}
if not is_water(p) then if not is_water(p) then
local nodename = minetest.get_node(p).name local nodedef = minetest.registered_nodes[minetest.get_node(p).name]
local nodedef = minetest.registered_nodes[nodename] if (not nodedef) or nodedef.walkable then
if nodename == "ignore" then
-- at world edge bounce boat back into world
self.v = -self.v
-- at world base avoid falling into ignore
new_velo = get_velocity(self.v, self.object:getyaw(), 0)
elseif (not nodedef) or nodedef.walkable then
self.v = 0 self.v = 0
new_acce = {x = 0, y = 1, z = 0} new_acce = {x = 0, y = 1, z = 0}
new_velo = get_velocity(self.v, self.object:getyaw(),
self.object:getvelocity().y)
else else
new_acce = {x = 0, y = -9.8, z = 0} new_acce = {x = 0, y = -9.8, z = 0}
end
new_velo = get_velocity(self.v, self.object:getyaw(), new_velo = get_velocity(self.v, self.object:getyaw(),
self.object:getvelocity().y) self.object:getvelocity().y)
end
self.object:setpos(self.object:getpos()) self.object:setpos(self.object:getpos())
else else
p.y = p.y + 1 p.y = p.y + 1