appgurueu
/
moblib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Assign ID before calling on_activate

master
Lars Mueller 2022-01-05 11:56:24 +01:00
parent 41f76257d3
commit c231ee4e3e
1 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
main.lua
View File

@ -184,6 +184,47 @@ function register_entity(name, def)
obj:set_velocity(vector.multiply(vector.divide(vel, len)))
end
end
end
local props_staticdata = props.staticdata
if props_staticdata then
local implementation
if type(props_staticdata) == "table" then
implementation = props_staticdata
else
implementation = ({
json = {
serializer = minetest.write_json,
deserializer = minetest.parse_json
},
lua = {
serializer = minetest.serialize,
deserializer = minetest.deserialize
}
})[props_staticdata]
end
local serializer = implementation.serializer
local deserializer = implementation.deserializer
local old_on_activate = on_activate
function on_activate(self, staticdata, dtime)
self._ = (staticdata ~= "" and deserializer(staticdata)) or {}
old_on_activate(self, staticdata, dtime)
end
function def.get_staticdata(self)
return serializer(self._)
end
end
if props.id then
assert(props_staticdata)
local old_on_activate = on_activate
function on_activate(self, staticdata, dtime)
if not self._.id then
highest_id = highest_id + 1
self._.id = highest_id
storage:set_int("highest_id", highest_id)
end
entities_by_id[self._.id] = self
old_on_activate(self, staticdata, dtime)
end
end
-- TODO consider HACK for #10158
if props.moveresult then
@ -280,47 +321,6 @@ function register_entity(name, def)
self._last_velocity = velocity
end
end
local props_staticdata = props.staticdata
if props_staticdata then
local implementation
if type(props_staticdata) == "table" then
implementation = props_staticdata
else
implementation = ({
json = {
serializer = minetest.write_json,
deserializer = minetest.parse_json
},
lua = {
serializer = minetest.serialize,
deserializer = minetest.deserialize
}
})[props_staticdata]
end
local serializer = implementation.serializer
local deserializer = implementation.deserializer
local old_on_activate = on_activate
function on_activate(self, staticdata, dtime)
self._ = (staticdata ~= "" and deserializer(staticdata)) or {}
old_on_activate(self, staticdata, dtime)
end
function def.get_staticdata(self)
return serializer(self._)
end
end
if props.id then
assert(props_staticdata)
local old_on_activate = on_activate
function on_activate(self, staticdata, dtime)
old_on_activate(self, staticdata, dtime)
if not self._.id then
highest_id = highest_id + 1
self._.id = highest_id
storage:set_int("highest_id", highest_id)
end
entities_by_id[self._.id] = self
end
end
def.on_activate = on_activate
def.on_step = on_step
minetest.register_entity(name, def)