From 389352d59f3d1ae1933215b0fd31b72aebf3a948 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Fri, 6 Mar 2020 10:34:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BF=BB=E6=BB=9A=E6=97=B6?=
 =?UTF-8?q?=E6=89=93=E6=96=AD=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/gameserver/human.cc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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;