From 0d1b25df6be9ffae9720d02b8f1b8a2375039b24 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Wed, 28 Apr 2021 15:20:16 +0800
Subject: [PATCH] 1

---
 server/gameserver/buff.cc  | 6 ++++++
 server/gameserver/human.cc | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/server/gameserver/buff.cc b/server/gameserver/buff.cc
index c0ca214..ee2a763 100644
--- a/server/gameserver/buff.cc
+++ b/server/gameserver/buff.cc
@@ -210,6 +210,12 @@ void Buff::ProcBecome(Creature* caster)
 
 void Buff::ProcRemoveBecome(Creature* caster)
 {
+    if (!hold_weapons_.empty()) {
+        Weapon* next_weapon = caster->AutoChgWeapon();
+        if (next_weapon) {
+            caster->SetCurrWeapon(next_weapon);
+        }
+    }
     for (auto& weapon : hold_weapons_) {
         if (weapon.weapon_idx >= 0 &&
             weapon.weapon_idx < caster->weapons.size()) {
diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc
index f4579d3..dce71c8 100644
--- a/server/gameserver/human.cc
+++ b/server/gameserver/human.cc
@@ -2627,6 +2627,9 @@ void Human::RandSkin()
         } else if (i == 2) {
             skin_id = 15001 + (rand() % 6);
         }
+        #if 1
+        skin_id = 1;
+        #endif
         Skin& skin = skins[i];
         skin.skin_id = skin_id;
         skin.skin_lv = 1;