From 4dcb679c539b4fce53e48dbd061ffdf860ef8d87 Mon Sep 17 00:00:00 2001 From: JJ Date: Fri, 27 Mar 2015 16:40:02 -0400 Subject: [PATCH] Manual merge of #387. --- zone/spells.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zone/spells.cpp b/zone/spells.cpp index 08030b8b5..a4bef767c 100644 --- a/zone/spells.cpp +++ b/zone/spells.cpp @@ -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;