added some nil checks
This commit is contained in:
TenPlus1
parent
e1707505c2
commit
4bdda7599d
6
init.lua
6
init.lua
@ -276,7 +276,7 @@ core.register_entity(":__builtin:item", {
|
||||
local is_slippery = false
|
||||
|
||||
-- destroy item when dropped into lava (if enabled)
|
||||
if destroy_item and def.groups.lava then
|
||||
if destroy_item and def and def.groups and def.groups.lava then
|
||||
minetest.sound_play("builtin_item_lava", {
|
||||
pos = pos,
|
||||
max_hear_distance = 6,
|
||||
@ -288,7 +288,7 @@ core.register_entity(":__builtin:item", {
|
||||
end
|
||||
|
||||
-- water flowing
|
||||
if def.liquidtype == "flowing" then
|
||||
if def and def.liquidtype == "flowing" then
|
||||
local vec = quick_flow(pos, node)
|
||||
if vec then
|
||||
local v = self.object:get_velocity()
|
||||
@ -298,7 +298,7 @@ core.register_entity(":__builtin:item", {
|
||||
end
|
||||
|
||||
-- item inside block, move to vacant space
|
||||
if not def.liquid
|
||||
if def and not def.liquid
|
||||
and node.name ~= "air"
|
||||
and def.drawtype == "normal" then
|
||||
local npos = minetest.find_node_near(pos, 1, "air")
|
||||
|
||||
476
init.lua_
476
init.lua_
@ -1,476 +0,0 @@
|
||||
|
||||
-- Replaces: builtin/item_entity.lua (13th January 2017)
|
||||
|
||||
-- water flow functions by QwertyMine3, edited by TenPlus1
|
||||
local function to_unit_vector(dir_vector)
|
||||
|
||||
local inv_roots = {
|
||||
[0] = 1,
|
||||
[1] = 1,
|
||||
[2] = 0.70710678118655,
|
||||
[4] = 0.5,
|
||||
[5] = 0.44721359549996,
|
||||
[8] = 0.35355339059327
|
||||
}
|
||||
|
||||
local sum = dir_vector.x * dir_vector.x + dir_vector.z * dir_vector.z
|
||||
|
||||
return {
|
||||
x = dir_vector.x * inv_roots[sum],
|
||||
y = dir_vector.y,
|
||||
z = dir_vector.z * inv_roots[sum]
|
||||
}
|
||||
end
|
||||
|
||||
|
||||
local function node_ok(pos)
|
||||
|
||||
local node = minetest.get_node_or_nil(pos)
|
||||
|
||||
if node and minetest.registered_nodes[node.name] then
|
||||
return node
|
||||
end
|
||||
|
||||
return minetest.registered_nodes["default:dirt"]
|
||||
end
|
||||
|
||||
|
||||
local function quick_flow_logic(node, pos_testing, direction)
|
||||
|
||||
local def = minetest.registered_nodes[node.name]
|
||||
|
||||
if def.liquidtype == "flowing" then
|
||||
|
||||
local node_testing = node_ok(pos_testing)
|
||||
|
||||
if minetest.registered_nodes[node_testing.name].liquidtype ~= "flowing"
|
||||
and minetest.registered_nodes[node_testing.name].liquidtype ~= "source" then
|
||||
return 0
|
||||
end
|
||||
|
||||
local param2_testing = node_testing.param2
|
||||
|
||||
if param2_testing < node.param2 then
|
||||
|
||||
if (node.param2 - param2_testing) > 6 then
|
||||
return -direction
|
||||
else
|
||||
return direction
|
||||
end
|
||||
|
||||
elseif param2_testing > node.param2 then
|
||||
|
||||
if (param2_testing - node.param2) > 6 then
|
||||
return direction
|
||||
else
|
||||
return -direction
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
return 0
|
||||
end
|
||||
|
||||
|
||||
local function quick_flow(pos, node)
|
||||
|
||||
if not minetest.registered_nodes[node.name].groups.liquid then
|
||||
return {x = 0, y = 0, z = 0}
|
||||
end
|
||||
|
||||
local x, z = 0, 0
|
||||
|
||||
x = x + quick_flow_logic(node, {x = pos.x - 1, y = pos.y, z = pos.z},-1)
|
||||
x = x + quick_flow_logic(node, {x = pos.x + 1, y = pos.y, z = pos.z}, 1)
|
||||
z = z + quick_flow_logic(node, {x = pos.x, y = pos.y, z = pos.z - 1},-1)
|
||||
z = z + quick_flow_logic(node, {x = pos.x, y = pos.y, z = pos.z + 1}, 1)
|
||||
|
||||
return to_unit_vector({x = x, y = 0, z = z})
|
||||
end
|
||||
-- END water flow functions
|
||||
|
||||
|
||||
function core.spawn_item(pos, item)
|
||||
|
||||
local obj = core.add_entity(pos, "__builtin:item")
|
||||
|
||||
-- Don't use obj if it couldn't be added to the map.
|
||||
if obj then
|
||||
obj:get_luaentity():set_item(ItemStack(item):to_string())
|
||||
end
|
||||
|
||||
return obj
|
||||
end
|
||||
|
||||
|
||||
-- if item_entity_ttl is not set, enity will have default life time
|
||||
-- setting to -1 disables the feature
|
||||
local time_to_live = tonumber(core.setting_get("item_entity_ttl")) or 900
|
||||
|
||||
-- if destroy_item is 1 then dropped items will burn inside lava
|
||||
local destroy_item = tonumber(core.setting_get("destroy_item")) or 1
|
||||
|
||||
-- entity gravity
|
||||
local gravity = tonumber(minetest.setting_get("movement_gravity")) or 9.81
|
||||
|
||||
-- particle effects for when item is destroyed
|
||||
local function add_effects(pos)
|
||||
|
||||
minetest.add_particlespawner({
|
||||
amount = 1,
|
||||
time = 0.25,
|
||||
minpos = pos,
|
||||
maxpos = pos,
|
||||
minvel = {x = -1, y = 2, z = -1},
|
||||
maxvel = {x = 1, y = 4, z = 1},
|
||||
minacc = {x = 0, y = 0, z = 0},
|
||||
maxacc = {x = 0, y = 0, z = 0},
|
||||
minexptime = 1,
|
||||
maxexptime = 3,
|
||||
minsize = 1,
|
||||
maxsize = 4,
|
||||
texture = "tnt_smoke.png",
|
||||
})
|
||||
end
|
||||
|
||||
|
||||
-- check if within map limits (-30911 to 30927)
|
||||
local function within_limits(pos)
|
||||
|
||||
if pos.x > -30913
|
||||
and pos.x < 30928
|
||||
and pos.y > -30913
|
||||
and pos.y < 30928
|
||||
and pos.z > -30913
|
||||
and pos.z < 30928 then
|
||||
return true -- within limits
|
||||
end
|
||||
|
||||
return false -- beyond limits
|
||||
end
|
||||
|
||||
|
||||
core.register_entity(":__builtin:item", {
|
||||
|
||||
initial_properties = {
|
||||
hp_max = 1,
|
||||
physical = true,
|
||||
collide_with_objects = false,
|
||||
collisionbox = {-0.3, -0.3, -0.3, 0.3, 0.3, 0.3},
|
||||
visual = "wielditem",
|
||||
visual_size = {x = 0.4, y = 0.4},
|
||||
textures = {""},
|
||||
spritediv = {x = 1, y = 1},
|
||||
initial_sprite_basepos = {x = 0, y = 0},
|
||||
is_visible = false,
|
||||
infotext = "",
|
||||
},
|
||||
|
||||
itemstring = "",
|
||||
physical_state = true,
|
||||
age = 0,
|
||||
|
||||
|
||||
set_item = function(self, itemstring)
|
||||
|
||||
self.itemstring = itemstring
|
||||
|
||||
local stack = ItemStack(itemstring)
|
||||
local itemname = stack:get_name()
|
||||
local max_count = stack:get_stack_max()
|
||||
local count = math.min(stack:get_count(), max_count)
|
||||
local size = 0.2 + 0.1 * (count / max_count)
|
||||
|
||||
if not core.registered_items[itemname] then
|
||||
itemname = "unknown"
|
||||
end
|
||||
|
||||
self.object:set_properties({
|
||||
is_visible = true,
|
||||
visual = "wielditem",
|
||||
textures = {itemname},
|
||||
visual_size = {x = size, y = size},
|
||||
collisionbox = {-size, -size, -size, size, size, size},
|
||||
automatic_rotate = math.pi * 0.5,
|
||||
wield_item = itemstring,
|
||||
infotext = core.registered_items[itemname].description
|
||||
})
|
||||
end,
|
||||
|
||||
|
||||
update_gravity = function(self)
|
||||
|
||||
if not self.physical_state then
|
||||
|
||||
self.object:setacceleration({x = 0, y = 0, z = 0})
|
||||
|
||||
return
|
||||
end
|
||||
|
||||
self.object:setacceleration({x = 0, y = -gravity, z = 0})
|
||||
end,
|
||||
|
||||
|
||||
get_staticdata = function(self)
|
||||
|
||||
return core.serialize({
|
||||
itemstring = self.itemstring,
|
||||
always_collect = self.always_collect,
|
||||
age = self.age,
|
||||
dropped_by = self.dropped_by
|
||||
})
|
||||
end,
|
||||
|
||||
|
||||
on_activate = function(self, staticdata, dtime_s)
|
||||
|
||||
if not self then
|
||||
|
||||
self.object:remove()
|
||||
|
||||
return
|
||||
end
|
||||
|
||||
if string.sub(staticdata, 1, string.len("return")) == "return" then
|
||||
|
||||
local data = core.deserialize(staticdata)
|
||||
|
||||
if data and type(data) == "table" then
|
||||
|
||||
self.itemstring = data.itemstring
|
||||
self.always_collect = data.always_collect
|
||||
self.age = data.age or 0
|
||||
self.age = self.age + dtime_s
|
||||
self.dropped_by = data.dropped_by
|
||||
end
|
||||
else
|
||||
self.itemstring = staticdata
|
||||
end
|
||||
|
||||
self.object:set_armor_groups({immortal = 1})
|
||||
self.object:setvelocity({x = 0, y = 2, z = 0})
|
||||
self:update_gravity()
|
||||
self:set_item(self.itemstring)
|
||||
end,
|
||||
|
||||
|
||||
-- moves items from this stack to an other stack
|
||||
try_merge_with = function(self, own_stack, object, obj)
|
||||
|
||||
-- cannot merge with itself
|
||||
if self.age == obj.age then
|
||||
return
|
||||
end
|
||||
|
||||
-- other item's stack
|
||||
local stack = ItemStack(obj.itemstring)
|
||||
|
||||
-- only merge if items are the same
|
||||
if own_stack:get_name() == stack:get_name()
|
||||
and own_stack:get_meta() == stack:get_meta()
|
||||
and own_stack:get_wear() == stack:get_wear()
|
||||
and stack:get_free_space() > 0 then
|
||||
|
||||
local overflow = false
|
||||
local count = stack:get_count() + own_stack:get_count()
|
||||
local max_count = stack:get_stack_max()
|
||||
|
||||
if count > max_count then
|
||||
|
||||
overflow = true
|
||||
stack:set_count(max_count)
|
||||
count = count - max_count
|
||||
own_stack:set_count(count)
|
||||
else
|
||||
self.itemstring = ""
|
||||
stack:set_count(count)
|
||||
end
|
||||
|
||||
local pos = object:getpos()
|
||||
|
||||
pos.y = pos.y + (count - stack:get_count()) / max_count * 0.15
|
||||
|
||||
object:moveto(pos, false)
|
||||
|
||||
local s, c
|
||||
|
||||
if not overflow then
|
||||
|
||||
obj.itemstring = stack:to_string()
|
||||
s = 0.2 + 0.1 * (count / max_count)
|
||||
c = s
|
||||
|
||||
object:set_properties({
|
||||
visual_size = {x = s, y = s},
|
||||
collisionbox = {-c, -c, -c, c, c, c},
|
||||
wield_item = obj.itemstring
|
||||
})
|
||||
|
||||
self.object:remove()
|
||||
|
||||
return true -- merged ok
|
||||
else
|
||||
s = 0.4
|
||||
c = 0.3
|
||||
|
||||
obj.itemstring = stack:to_string()
|
||||
|
||||
object:set_properties({
|
||||
visual_size = {x = s, y = s},
|
||||
collisionbox = {-c, -c, -c, c, c, c},
|
||||
wield_item = obj.itemstring
|
||||
})
|
||||
|
||||
s = 0.2 + 0.1 * (count / max_count)
|
||||
c = s
|
||||
|
||||
self.itemstring = own_stack:to_string()
|
||||
|
||||
self.object:set_properties({
|
||||
visual_size = {x = s, y = s},
|
||||
collisionbox = {-c, -c, -c, c, c, c},
|
||||
wield_item = self.itemstring
|
||||
})
|
||||
end
|
||||
end
|
||||
|
||||
return false -- merge failed
|
||||
end,
|
||||
|
||||
|
||||
on_step = function(self, dtime)
|
||||
|
||||
self.age = self.age + dtime
|
||||
if (time_to_live > 0 and self.age > time_to_live)
|
||||
or self.itemstring == "" then
|
||||
self.itemstring = ""
|
||||
self.object:remove()
|
||||
return
|
||||
end
|
||||
|
||||
self.timer = (self.timer or 0) + dtime
|
||||
if self.timer < 0.5 then
|
||||
return
|
||||
end
|
||||
self.timer = 0
|
||||
|
||||
local pos = self.object:getpos()
|
||||
local node = node_ok({
|
||||
x = pos.x,
|
||||
y = pos.y,
|
||||
z = pos.z
|
||||
})
|
||||
local def = core.registered_nodes[node.name]
|
||||
|
||||
-- item inside block, move to vacant space
|
||||
if not def.liquid
|
||||
and node.name ~= "air"
|
||||
and def.drawtype == "normal" then
|
||||
|
||||
local npos = minetest.find_node_near(pos, 1, "air")
|
||||
if npos then
|
||||
self.object:moveto(npos)
|
||||
end
|
||||
return
|
||||
end
|
||||
|
||||
-- destroy item when dropped into lava (if enabled)
|
||||
if destroy_item > 0 and def.groups.lava then
|
||||
minetest.sound_play("builtin_item_lava", {
|
||||
pos = pos,
|
||||
max_hear_distance = 6,
|
||||
gain = 0.5
|
||||
})
|
||||
add_effects(pos)
|
||||
self.object:remove()
|
||||
return
|
||||
end
|
||||
|
||||
-- if inside flowing water then push item
|
||||
if def.liquidtype == "flowing" then
|
||||
|
||||
local vec = quick_flow(pos, node)
|
||||
|
||||
if vec then
|
||||
|
||||
local v = self.object:getvelocity()
|
||||
|
||||
self.object:setvelocity(
|
||||
{x = vec.x, y = v.y, z = vec.z})
|
||||
end
|
||||
|
||||
return
|
||||
else
|
||||
|
||||
-- if on ice then keep on sliding
|
||||
if self.object:getvelocity().y == 0
|
||||
and minetest.get_node({
|
||||
x = pos.x,
|
||||
y = pos.y - 0.5,
|
||||
z = pos.z}).name ~= "default:ice" then
|
||||
|
||||
self.object:setvelocity({x = 0, y = 0, z = 0})
|
||||
end
|
||||
end
|
||||
|
||||
-- Ignore is walkable -> stop until the block loaded
|
||||
local entity_fall = not def.walkable
|
||||
|
||||
if self.physical_state == entity_fall then
|
||||
|
||||
-- This stops pushing items where water caused them
|
||||
-- to continue flowing from stationary
|
||||
if not entity_fall then
|
||||
self.object:setvelocity({x = 0, y = 0, z = 0})
|
||||
end
|
||||
|
||||
-- Collect the items around to merge with
|
||||
local own_stack = ItemStack(self.itemstring)
|
||||
if own_stack:get_free_space() == 0 then
|
||||
return
|
||||
end
|
||||
|
||||
local objects = core.get_objects_inside_radius(pos, 0.8)
|
||||
|
||||
for k, object in ipairs(objects) do
|
||||
|
||||
local entity = object:get_luaentity()
|
||||
|
||||
if entity and entity.name == "__builtin:item" then
|
||||
|
||||
if self:try_merge_with(own_stack, object, entity) then
|
||||
|
||||
own_stack = ItemStack(self.itemstring)
|
||||
|
||||
if own_stack:get_free_space() == 0 then
|
||||
return
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
return
|
||||
end
|
||||
end,
|
||||
|
||||
|
||||
on_punch = function(self, puncher)
|
||||
|
||||
local inv = puncher:get_inventory()
|
||||
|
||||
if inv and self.itemstring ~= "" then
|
||||
|
||||
local left = inv:add_item("main", self.itemstring)
|
||||
|
||||
if left and not left:is_empty() then
|
||||
|
||||
self:set_item(left:to_string())
|
||||
|
||||
return
|
||||
end
|
||||
end
|
||||
|
||||
self.itemstring = ""
|
||||
self.object:remove()
|
||||
end,
|
||||
})
|
||||
Loading…
x
Reference in New Issue
Block a user