diff options
| author | Shauren <shauren.trinity@gmail.com> | 2016-07-10 11:30:39 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2016-07-10 11:30:39 +0200 |
| commit | ee2abfba9102ca4acce334de00a0bca0ae5c624c (patch) | |
| tree | dea1a5ae90d6dff5d0488a6cc0a9e9f599890ad0 | |
| parent | 0d9136f7648e623d6b15d67e2d4d83e91d3603da (diff) | |
| parent | 22d29ce0494c32a73e20646d2320a44a5eb2e633 (diff) | |
Merge branch '6.x' of https://github.com/TrinityCore/TrinityCore into legion
| -rw-r--r-- | src/server/game/Entities/Item/Item.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Entities/Object/Object.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/server/game/Entities/Item/Item.cpp b/src/server/game/Entities/Item/Item.cpp index 73bdbf37a93..94d6c4ee19a 100644 --- a/src/server/game/Entities/Item/Item.cpp +++ b/src/server/game/Entities/Item/Item.cpp @@ -1955,7 +1955,7 @@ ItemModifiedAppearanceEntry const* Item::GetItemModifiedAppearance() const uint32 Item::GetModifier(ItemModifier modifier) const { - return GetDynamicValues(ITEM_DYNAMIC_FIELD_MODIFIERS)[modifier]; + return GetDynamicValue(ITEM_DYNAMIC_FIELD_MODIFIERS, modifier); } void Item::SetModifier(ItemModifier modifier, uint32 value) diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index 39538213461..d61fdf09c93 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -1356,7 +1356,8 @@ std::vector<uint32> const& Object::GetDynamicValues(uint16 index) const uint32 Object::GetDynamicValue(uint16 index, uint16 offset) const { ASSERT(index < _dynamicValuesCount || PrintIndexError(index, false)); - ASSERT(offset < _dynamicValues[index].size()); + if (offset >= _dynamicValues[index].size()) + return 0; return _dynamicValues[index][offset]; } |