Manual merge of #387.

This commit is contained in:
JJ 2015-03-27 16:40:02 -04:00
parent ad9e9ba2d6
commit 4dcb679c53

View File

@ -2672,7 +2672,7 @@ int CalcBuffDuration_formula(int level, int formula, int duration)
return i < duration ? (i < 1 ? 1 : i) : duration;
case 11:
return duration;
return std::min((level + 3) * 30, duration);
case 12:
return duration;
@ -5254,7 +5254,7 @@ void Client::SendBuffDurationPacket(Buffs_Struct &buff)
sbf->slot = 2;
sbf->spellid = buff.spellid;
sbf->slotid = 0;
sbf->effect = buff.casterlevel > 0 ? buff.casterlevel : GetLevel();
sbf->effect = 255;
sbf->level = buff.casterlevel > 0 ? buff.casterlevel : GetLevel();
sbf->bufffade = 0;
sbf->duration = buff.ticsremaining;