erle
/
mainmenu_csm
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't crash if an item gets dropped into unloaded space 

Items dropped into unloaded map space will crash game so here's a fix...
This commit is contained in:
tenplus1 2015-05-14 11:35:24 +01:00 committed by Nils Dagsson Moskopp
parent e50a93d25a
commit e172295337
Signed by: erle
GPG Key ID: A3BC671C35191080
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
builtin/game/item_entity.lua
View File

@ -155,7 +155,17 @@ core.register_entity(":__builtin:item", {
end
local p = self.object:getpos()
p.y = p.y - 0.5
local nn = core.get_node(p).name
local node = core.get_node_or_nil(p)
local in_unloaded = (node == nil)
if in_unloaded then
-- Don't infinetly fall into unloaded map
self.object:setvelocity({x = 0, y = 0, z = 0})
self.object:setacceleration({x = 0, y = 0, z = 0})
self.physical_state = false
self.object:set_properties({physical = false})
return
end
local nn = node.name
-- If node is not registered or node is walkably solid and resting on nodebox
local v = self.object:getvelocity()
if not core.registered_nodes[nn] or core.registered_nodes[nn].walkable and v.y == 0 then