diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc index 7519503..185ecb2 100644 --- a/server/gameserver/human.cc +++ b/server/gameserver/human.cc @@ -1038,7 +1038,9 @@ bool Human::CanUseSkill() void Human::DoSkill() { - if (action_type == AT_Relive) { + if (action_type == AT_Reload || + action_type == AT_UseItem + ) { CancelAction(); } if (CanUseSkill()) { @@ -2385,7 +2387,7 @@ void Human::RandSkin() void Human::AddSkin(int skin_id) { - if (skins.size() < 3) { + if (skins.size() < 4) { Skin& skin = a8::FastAppend(skins); skin.skin_id = skin_id; skin.skin_lv = 1;