summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNovatux <nathanael.courant@laposte.net>2015-06-23 19:00:17 +0200
committerNovatux <nathanael.courant@laposte.net>2015-06-23 19:00:17 +0200
commitdada8474fed067c2c89684147ae0b0c7da36074a (patch)
treeaef2526cf25b9369f96d03efc47d451d1a1b9b40
parentd0952a97fcff08328328d05f630d2b0036a48163 (diff)
downloadpipeworks-dada8474fed067c2c89684147ae0b0c7da36074a.tar
pipeworks-dada8474fed067c2c89684147ae0b0c7da36074a.tar.gz
pipeworks-dada8474fed067c2c89684147ae0b0c7da36074a.tar.bz2
pipeworks-dada8474fed067c2c89684147ae0b0c7da36074a.tar.xz
pipeworks-dada8474fed067c2c89684147ae0b0c7da36074a.zip
Revert "fix multiple crash points if luaentity.entities or values returned from"
This reverts commit d0952a97fcff08328328d05f630d2b0036a48163.
-rw-r--r--item_transport.lua1
-rw-r--r--luaentity.lua6
2 files changed, 0 insertions, 7 deletions
diff --git a/item_transport.lua b/item_transport.lua
index 7b64e7a..fb9f626 100644
--- a/item_transport.lua
+++ b/item_transport.lua
@@ -6,7 +6,6 @@ function pipeworks.tube_inject_item(pos, start_pos, velocity, item)
-- Take item in any format
local stack = ItemStack(item)
local obj = luaentity.add_entity(pos, "pipeworks:tubed_item")
- if not obj then return end
obj:set_item(stack:to_string())
obj.start_pos = vector.new(start_pos)
obj:setvelocity(velocity)
diff --git a/luaentity.lua b/luaentity.lua
index 9be0f3a..241da14 100644
--- a/luaentity.lua
+++ b/luaentity.lua
@@ -22,7 +22,6 @@ end
local function read_entities()
local t = read_file()
- if not t then return end
for _, entity in pairs(t) do
setmetatable(entity, luaentity.registered_entities[entity.name])
end
@@ -30,7 +29,6 @@ local function read_entities()
end
local function write_entities()
- if not luaentity.entities then return end
for _, entity in pairs(luaentity.entities) do
setmetatable(entity, nil)
for _, attached in pairs(entity._attached_entities) do
@@ -253,7 +251,6 @@ end
-- end
function luaentity.add_entity(pos, name)
- if not luaentity.entities then return end
local index = luaentity.entities_index
while luaentity.entities[index] do
index = index + 1
@@ -284,7 +281,6 @@ end
-- todo: check if remove in get_staticdata works
function luaentity.get_staticdata(self)
- if not luaentity.entities then return end
local parent = luaentity.entities[self.parent_id]
if parent and parent._remove_attached then
parent:_remove_attached(self.attached_id)
@@ -299,7 +295,6 @@ function luaentity.on_activate(self, staticdata)
end
function luaentity.get_objects_inside_radius(pos, radius)
- if not luaentity.entities then return end
local objects = {}
local index = 1
for id, entity in pairs(luaentity.entities) do
@@ -314,7 +309,6 @@ minetest.register_globalstep(function(dtime)
if not luaentity.entities then
luaentity.entities = read_entities()
end
- if not luaentity.entities then return end
for id, entity in pairs(luaentity.entities) do
local master = entity._attached_entities_master
if master then