Merge branch 'master' into patch-1

Sphereserver · Jan 7, 2025 · fafd47d · fafd47d
2 parents ebf4761 + 95011cf
commit fafd47d
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/src/game/items/CItem.cpp b/src/game/items/CItem.cpp
@@ -3342,7 +3342,17 @@ bool CItem::r_LoadVal( CScript & s ) // Load an item Script
 			SetUnkZ( s.GetArgCVal() ); // GetEquipLayer()
             break;
 		case IC_LINK:
-			m_uidLink.SetObjUID(s.GetArgDWVal());
+			{
+                CUID uidLink = (CUID)s.GetArgDWVal();
+                if ((dword)uidLink == 0)
+                {
+                    m_uidLink.InitUID();
+                }
+                else
+                {
+                    m_uidLink.SetObjUID(uidLink);
+                }
+            }
             break;
 
 		case IC_FRUIT:	// m_more2