Backports from 400 branch.

This commit is contained in:
tomrus88 2010-11-15 18:01:45 +03:00
parent bf774f49ce
commit 76dfdd336f
32 changed files with 223 additions and 210 deletions

View file

@ -1180,10 +1180,11 @@ void Pet::_LoadAuras(uint32 timediff)
continue;
// prevent wrong values of remaincharges
if(spellproto->procCharges)
uint32 procCharges = spellproto->procCharges;
if(procCharges)
{
if(remaincharges <= 0 || remaincharges > (int32)spellproto->procCharges)
remaincharges = spellproto->procCharges;
if(remaincharges <= 0 || remaincharges > (int32)procCharges)
remaincharges = procCharges;
}
else
remaincharges = 0;