pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-15 12:31:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Manual merge of #387.

Browse Source
This commit is contained in:
JJ 2015-03-27 16:40:02 -04:00
parent ad9e9ba2d6
commit 4dcb679c53
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zone/spells.cpp
View File

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