mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-13 13:37:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[11632] Revert part of 11631

Browse source
This commit is contained in:
zergtmn 2011-06-17 16:27:00 +06:00
parent 10865b633f
commit 54f623d2b8
3 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/game/Pet.cpp
View file

@ -1324,7 +1324,11 @@ void Pet::_LoadAuras(uint32 timediff)
if (spellproto->procCharges == 0) if (spellproto->procCharges == 0)
remaincharges = 0; remaincharges = 0;
if (stackcount == 0) if (!spellproto->StackAmount)
stackcount = 1;
else if (spellproto->StackAmount < stackcount)
stackcount = spellproto->StackAmount;
else if (!stackcount)
stackcount = 1; stackcount = 1;
SpellAuraHolder *holder = CreateSpellAuraHolder(spellproto, this, NULL); SpellAuraHolder *holder = CreateSpellAuraHolder(spellproto, this, NULL);

6
src/game/Player.cpp
View file

@ -16044,7 +16044,11 @@ void Player::_LoadAuras(QueryResult *result, uint32 timediff)
if (spellproto->procCharges == 0) if (spellproto->procCharges == 0)
remaincharges = 0; remaincharges = 0;
if (stackcount == 0) if (!spellproto->StackAmount)
stackcount = 1;
else if (spellproto->StackAmount < stackcount)
stackcount = spellproto->StackAmount;
else if (!stackcount)
stackcount = 1; stackcount = 1;
SpellAuraHolder *holder = CreateSpellAuraHolder(spellproto, this, NULL); SpellAuraHolder *holder = CreateSpellAuraHolder(spellproto, this, NULL);

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "11631" #define REVISION_NR "11632"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__