From 54f623d2b8b8b9beed9ca9a306be79b46b95048c Mon Sep 17 00:00:00 2001 From: zergtmn Date: Fri, 17 Jun 2011 16:27:00 +0600 Subject: [PATCH] [11632] Revert part of 11631 --- src/game/Pet.cpp | 6 +++++- src/game/Player.cpp | 6 +++++- src/shared/revision_nr.h | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/game/Pet.cpp b/src/game/Pet.cpp index 24fae25fe..42b88da41 100644 --- a/src/game/Pet.cpp +++ b/src/game/Pet.cpp @@ -1324,7 +1324,11 @@ void Pet::_LoadAuras(uint32 timediff) if (spellproto->procCharges == 0) remaincharges = 0; - if (stackcount == 0) + if (!spellproto->StackAmount) + stackcount = 1; + else if (spellproto->StackAmount < stackcount) + stackcount = spellproto->StackAmount; + else if (!stackcount) stackcount = 1; SpellAuraHolder *holder = CreateSpellAuraHolder(spellproto, this, NULL); diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 6dcda0353..57ea0683f 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -16044,7 +16044,11 @@ void Player::_LoadAuras(QueryResult *result, uint32 timediff) if (spellproto->procCharges == 0) remaincharges = 0; - if (stackcount == 0) + if (!spellproto->StackAmount) + stackcount = 1; + else if (spellproto->StackAmount < stackcount) + stackcount = spellproto->StackAmount; + else if (!stackcount) stackcount = 1; SpellAuraHolder *holder = CreateSpellAuraHolder(spellproto, this, NULL); diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 4a0704ebd..693154126 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "11631" + #define REVISION_NR "11632" #endif // __REVISION_NR_H__