diff options
| author | joschiwald <joschiwald.trinity@gmail.com> | 2017-11-19 16:25:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-19 16:25:30 +0100 |
| commit | f9067f2aab4f872c2f7a8f58efd6d8ed74fedbf8 (patch) | |
| tree | 215c8b1705e21b5f0edfca9cead80674f1d6c035 /src/server/game/Entities/Player | |
| parent | b12b37058c863bcfecfefc965da45f31b604ee3b (diff) | |
Core/Auras: don't save auras casted by items
* Core/Auras: don't save auras casted by items
- This type of auras (like Water Bucket, Precious Ribbon, etc) will be recasted on login anyways.
This reverts commit 16cfd59f5b368fd1d05eeeab3afbacfccf0a6870
(partial cherry picked from commit e84dfff4cee74baf2c02cc7752df5bf392eae180)
Core/Auras: fix elixir aura saving
(cherry picked from commit 697147a596515c82817a161e7a9a5f07cdf9a8f3)
Diffstat (limited to 'src/server/game/Entities/Player')
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 7c1c34ef59a..e21b5e06607 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -18297,7 +18297,7 @@ void Player::_LoadAuras(PreparedQueryResult auraResult, PreparedQueryResult effe AuraLoadEffectInfo& info = effectInfo[key]; ObjectGuid castId = ObjectGuid::Create<HighGuid::Cast>(SPELL_CAST_SOURCE_NORMAL, GetMapId(), spellInfo->Id, GetMap()->GenerateLowGuid<HighGuid::Cast>()); - if (Aura* aura = Aura::TryCreate(spellInfo, castId, key.EffectMask, this, nullptr, info.BaseAmounts.data(), nullptr, casterGuid, castItemLevel)) + if (Aura* aura = Aura::TryCreate(spellInfo, castId, key.EffectMask, this, nullptr, info.BaseAmounts.data(), nullptr, casterGuid, itemGuid, castItemLevel)) { if (!aura->CanBeSaved()) { |