undo painting patches

This commit is contained in:
Elkien3 2017-12-08 11:23:08 -06:00
parent e5a75ee159
commit 21a1bb33de

View File

@ -186,13 +186,13 @@ minetest.register_entity("painting:picent", {
on_activate = function(self, staticdata) on_activate = function(self, staticdata)
local pos = self.object:getpos() local pos = self.object:getpos()
local data = legacy.load_itemmeta(minetest.get_meta(pos):get_string("painting:picturedata")) local data = legacy.load_itemmeta(minetest.get_meta(pos):get_string("painting:picturedata"))
data = minetest.deserialize data = minetest.deserialize(
minetest.decompress(data)
)
if not data if not data
or not data.grid then or not data.grid then
return return
end end
data = minetest.decompress(data)
self.object:set_properties{textures = { to_imagestring(data.grid, data.res) }} self.object:set_properties{textures = { to_imagestring(data.grid, data.res) }}
if data.version ~= current_version then if data.version ~= current_version then
minetest.log("legacy", "[painting] updating placed picture data") minetest.log("legacy", "[painting] updating placed picture data")
@ -572,7 +572,6 @@ function legacy.load_itemmeta(data)
local vend = data:find"(version)" local vend = data:find"(version)"
if not vend then -- the oldest version if not vend then -- the oldest version
local t = minetest.deserialize(data) local t = minetest.deserialize(data)
if not t then return end
if t.version then if t.version then
minetest.log("error", "[painting] this musn't happen!") minetest.log("error", "[painting] this musn't happen!")
end end