From ab5857e7e2c833586810e236f233211bea614724 Mon Sep 17 00:00:00 2001
From: Gent <gentsemaj@live.com>
Date: Fri, 16 Oct 2020 19:54:05 -0400
Subject: [PATCH] Fix re-crocpotting (#134)

---
 src/NPCManager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/NPCManager.cpp b/src/NPCManager.cpp
index cd798b1..508d028 100644
--- a/src/NPCManager.cpp
+++ b/src/NPCManager.cpp
@@ -506,7 +506,7 @@ void NPCManager::npcCombineItems(CNSocket* sock, CNPacketData* data) {
         resp.iSuccessFlag = 1;
 
         // modify the looks item with the new stats and set the appearance through iOpt
-        itemLooks->iOpt = (int32_t)itemLooks->iID << 16;
+        itemLooks->iOpt = (int32_t)((itemLooks->iOpt) >> 16 > 0 ? (itemLooks->iOpt >> 16) : itemLooks->iID) << 16;
         itemLooks->iID = itemStats->iID;
 
         // delete stats item