Merge pull request 'Fix zombie villager curing (crash)' (#2368) from fix_zvillager_curing into master

Reviewed-on: MineClone2/MineClone2#2368

mods/ENTITIES/mobs_mc/villager.lua

@@ -1362,17 +1362,17 @@ mcl_mobs:register_mob("mobs_mc:villager", {
 	end,
 
 	on_spawn = function(self)
-		if self._id then
-			set_textures(self)
-			return
-		end
-		self._id=minetest.sha1(minetest.get_gametime()..minetest.pos_to_string(self.object:get_pos())..tostring(math.random()))
 		if not self._profession then
 			self._profession = "unemployed"
 			if math.random(100) == 1 then
 				self._profession = "nitwit"
 			end
 		end
+		if self._id then
+			set_textures(self)
+			return
+		end
+		self._id=minetest.sha1(minetest.get_gametime()..minetest.pos_to_string(self.object:get_pos())..tostring(math.random()))
 		set_textures(self)
 	end,
 	on_die = function(self, pos)

mods/ENTITIES/mobs_mc/villager_zombie.lua

@@ -119,20 +119,7 @@ mcl_mobs:register_mob("mobs_mc:villager_zombie", {
 				villager_obj:set_yaw(yaw)
 				villager.target_yaw = yaw
 				villager.nametag = self.nametag
-				local texture = self.base_texture[1]:gsub("zombie", "villager")
+				villager._profession = "unemployed"
-				if texture == "mobs_mc_villager_villager.png" then
-					texture = "mobs_mc_villager.png"
-				end
-				local textures = {texture}
-				villager.base_texture = textures
-				villager_obj:set_properties({textures = textures})
-				local matches = {}
-				for prof, tex in pairs(professions) do
-					if texture == tex then
-						table.insert(matches, prof)
-					end
-				end
-				villager._profession = matches[math.random(#matches)]
 				self._curing = nil
 				mcl_burning.extinguish(obj)
 				obj:remove()