Dynguid/Linking: Fix template linkage for non db spawns

cmangos · Sep 15, 2021 · 0d87b55 · 0d87b55
1 parent f1d0e23
commit 0d87b55
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/game/Entities/CreatureLinkingMgr.cpp b/src/game/Entities/CreatureLinkingMgr.cpp
@@ -533,7 +533,11 @@ void CreatureLinkingHolder::ProcessSlaveGuidList(CreatureLinkingEvent eventType,
 
     for (auto slave_itr = slaveGuidList.begin(); slave_itr != slaveGuidList.end();)
     {
-        Creature* pSlave = pSource->GetMap()->GetCreature((*slave_itr).first);
+        Creature* pSlave;
+        if ((*slave_itr).first)
+            pSlave = pSource->GetMap()->GetCreature((*slave_itr).first);
+        else
+            pSlave = pSource->GetMap()->GetCreature((*slave_itr).second);
         if ((!pSlave || pSlave->IsCorpse()) && preprocessFlag) // dynguid respawning
             pSource->GetMap()->GetSpawnManager().RespawnCreature((*slave_itr).first);
         if (!pSlave)