diff options
| author | Meji <alvaro.megias@outlook.com> | 2023-03-30 18:54:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-30 18:54:27 +0200 |
| commit | 81ea6f54d93ee10b03e6432c6071e0d0983796a2 (patch) | |
| tree | 8e94c4d807ee69c2a3800f8cd9c360c460952a24 /src/server/game/Events/GameEventMgr.cpp | |
| parent | 229a7ac79d38b9db76387f92e846c04c151ad3aa (diff) | |
Core/Creatures: Compute CombatReach and BoundingRadius using DisplayScale (#28863)
Diffstat (limited to 'src/server/game/Events/GameEventMgr.cpp')
| -rw-r--r-- | src/server/game/Events/GameEventMgr.cpp | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/src/server/game/Events/GameEventMgr.cpp b/src/server/game/Events/GameEventMgr.cpp index e3bdf6ad270..12e9c070bfd 100644 --- a/src/server/game/Events/GameEventMgr.cpp +++ b/src/server/game/Events/GameEventMgr.cpp @@ -1395,22 +1395,14 @@ void GameEventMgr::ChangeEquipOrModel(int16 event_id, bool activate) itr->second.equipement_id_prev = creature->GetCurrentEquipmentId(); itr->second.modelid_prev = creature->GetDisplayId(); creature->LoadEquipment(itr->second.equipment_id, true); - if (itr->second.modelid > 0 && itr->second.modelid_prev != itr->second.modelid && - sObjectMgr->GetCreatureModelInfo(itr->second.modelid)) - { - creature->SetDisplayId(itr->second.modelid); - creature->SetNativeDisplayId(itr->second.modelid); - } + if (itr->second.modelid > 0 && itr->second.modelid_prev != itr->second.modelid && sObjectMgr->GetCreatureModelInfo(itr->second.modelid)) + creature->SetDisplayId(itr->second.modelid, true); } else { creature->LoadEquipment(itr->second.equipement_id_prev, true); - if (itr->second.modelid_prev > 0 && itr->second.modelid_prev != itr->second.modelid && - sObjectMgr->GetCreatureModelInfo(itr->second.modelid_prev)) - { - creature->SetDisplayId(itr->second.modelid_prev); - creature->SetNativeDisplayId(itr->second.modelid_prev); - } + if (itr->second.modelid_prev > 0 && itr->second.modelid_prev != itr->second.modelid && sObjectMgr->GetCreatureModelInfo(itr->second.modelid_prev)) + creature->SetDisplayId(itr->second.modelid_prev, true); } } }); |