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

---
 server/gameserver/buff.cc | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/server/gameserver/buff.cc b/server/gameserver/buff.cc
index ee2a763..9142d4e 100644
--- a/server/gameserver/buff.cc
+++ b/server/gameserver/buff.cc
@@ -210,18 +210,18 @@ 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()) {
             caster->weapons[weapon.weapon_idx] = weapon;
         }
     }
+    if (!hold_weapons_.empty()) {
+        Weapon* next_weapon = caster->AutoChgWeapon();
+        if (next_weapon) {
+            caster->SetCurrWeapon(next_weapon);
+        }
+    }
     hold_weapons_.clear();
     caster->need_sync_active_player = true;
     caster->SyncAroundPlayers(__FILE__, __LINE__, __func__);