Spell: Knockbacks can safely remove -100 and spell 10101 should be -100

-101 removes whole ref
cmangos · Aug 22, 2021 · 6b148ad · 6b148ad
1 parent df68ab4
commit 6b148ad
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/src/game/Entities/GameObject.cpp b/src/game/Entities/GameObject.cpp
@@ -873,14 +873,10 @@ bool GameObject::LoadFromDB(uint32 dbGuid, Map* map, uint32 newGuid, GenericTran
 
     m_dbGuid = dbGuid;
 
-<<<<<<< HEAD
-    if (!Create(newGuid, entry, map, phaseMask, x, y, z, ang, data->rotation, animprogress, go_state))
-=======
     if (uint32 randomEntry = sObjectMgr.GetRandomGameObjectEntry(GetDbGuid()))
         entry = randomEntry;
 
-    if (!Create(newGuid, entry, map, x, y, z, ang, rotation0, rotation1, rotation2, rotation3, animprogress, go_state))
->>>>>>> 2197d1752a3... [s2432] DynGuid: Implement gameobject_spawn_entry
+    if (!Create(newGuid, entry, map, phaseMask, x, y, z, ang, data->rotation, animprogress, go_state))
         return false;
 
     if (!GetGOInfo()->GetDespawnPossibility() && !GetGOInfo()->IsDespawnAtAction() && data->spawntimesecsmin >= 0)