Fix remaining crash if player_api isn't available
parent
29229e6a93
commit
88d2e10ad9
|
@ -382,11 +382,10 @@ function def:on_punch(puncher)
|
|||
self:_update_texture()
|
||||
epidermis.set_player_data(player_name, {epidermis = self._.base_texture})
|
||||
-- Swap skins & meshes with owner
|
||||
local puncher_model = player_api.get_animation(puncher).model
|
||||
local puncher_model = epidermis.get_model(puncher)
|
||||
local puncher_skin = epidermis.get_skin(puncher)
|
||||
player_api.set_model(puncher, self._.mesh)
|
||||
epidermis.set_model(puncher, self._.mesh)
|
||||
epidermis.set_skin(puncher, self._.base_texture)
|
||||
player_api.set_textures(puncher, {self._.base_texture})
|
||||
if puncher_skin:match"^[^%[%^]+%.png$" then -- simple texture without modifiers
|
||||
self:_set_mesh(puncher_model)
|
||||
self:_set_texture(puncher_skin, true)
|
||||
|
|
15
skin.lua
15
skin.lua
|
@ -34,4 +34,19 @@ end
|
|||
|
||||
function epidermis.set_skin(player, skin)
|
||||
set_texture(player, skin_texture_index, skin)
|
||||
end
|
||||
|
||||
function epidermis.get_model(player)
|
||||
if player_api then
|
||||
return player_api.get_animation(player).model
|
||||
end
|
||||
return player:get_properties().mesh
|
||||
end
|
||||
|
||||
function epidermis.set_model(player, model)
|
||||
if player_api then
|
||||
player_api.set_model(player, model)
|
||||
return
|
||||
end
|
||||
player:set_properties{mesh = model}
|
||||
end
|
Loading…
Reference in New Issue