diff options
| author | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-02-21 00:45:02 +0100 |
|---|---|---|
| committer | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-02-21 00:45:02 +0100 |
| commit | c0c2e533a967640bd14553fa98916974e013e7bd (patch) | |
| tree | 593c67bc0d63e33efe7658b2f81ccf1cc5df5134 /src/server/game/Events/GameEventMgr.cpp | |
| parent | 1df992e918e954431f49626d44345530b50e591a (diff) | |
| parent | 59c3c6b8a6a318c3b937defaeb165a5f77b25ff8 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Handlers/MiscHandler.cpp
Diffstat (limited to 'src/server/game/Events/GameEventMgr.cpp')
| -rw-r--r-- | src/server/game/Events/GameEventMgr.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Events/GameEventMgr.cpp b/src/server/game/Events/GameEventMgr.cpp index d06ff1fa533..36193d78218 100644 --- a/src/server/game/Events/GameEventMgr.cpp +++ b/src/server/game/Events/GameEventMgr.cpp @@ -1366,7 +1366,7 @@ void GameEventMgr::ChangeEquipOrModel(int16 event_id, bool activate) sObjectMgr->GetCreatureModelRandomGender(&displayID); if (data2->equipmentId == 0) - itr->second.equipement_id_prev = 1; + itr->second.equipement_id_prev = 0; ///@todo: verify this line else if (data2->equipmentId != -1) itr->second.equipement_id_prev = data->equipmentId; itr->second.modelid_prev = displayID; |