From ce0badde87dbff8f5acd9c085babd4db06bd2e69 Mon Sep 17 00:00:00 2001
From: Martin Michelsen <fuzziqersoftware+g@gmail.com>
Date: Sun, 5 May 2024 08:42:59 -0700
Subject: [PATCH] fix mag stats reset on item combination

---
 src/Items.cc | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/Items.cc b/src/Items.cc
index 76f3d516..66c037c8 100644
--- a/src/Items.cc
+++ b/src/Items.cc
@@ -243,9 +243,12 @@ void player_use_item(shared_ptr<Client> c, size_t item_index, shared_ptr<PSOLFGE
 
         inv_item.data.data1[0] = combo.result_item[0];
         inv_item.data.data1[1] = combo.result_item[1];
-        inv_item.data.data1[2] = combo.result_item[2];
-        inv_item.data.data1[3] = 0; // Grind
-        inv_item.data.data1[4] = 0; // Flags + special
+        // For mags, don't reset level + PBs + stats
+        if (inv_item.data.data1[1] != 0x02) {
+          inv_item.data.data1[2] = combo.result_item[2];
+          inv_item.data.data1[3] = 0; // Grind
+          inv_item.data.data1[4] = 0; // Flags + special
+        }
         inv_item.flags &= (~8); // Unequip it
       } catch (const out_of_range&) {
       }