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

Merge pull request #485 from noudess/master

Browse Source 
More fixes for SendBuffDuration
This commit is contained in:
Alex 2016-01-02 13:43:27 -08:00
commit d1d963df10
1 changed files with 44 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
zone/spells.cpp
View File

@ -5310,6 +5310,7 @@ void Client::SendBuffDurationPacket(Buffs_Struct &buff)
EQApplicationPacket* outapp; EQApplicationPacket* outapp;
outapp = new EQApplicationPacket(OP_Buff, sizeof(SpellBuffFade_Struct)); outapp = new EQApplicationPacket(OP_Buff, sizeof(SpellBuffFade_Struct));
SpellBuffFade_Struct* sbf = (SpellBuffFade_Struct*) outapp->pBuffer; SpellBuffFade_Struct* sbf = (SpellBuffFade_Struct*) outapp->pBuffer;
int index;
sbf->entityid = GetID(); sbf->entityid = GetID();
sbf->slot = 2; sbf->slot = 2;
@ -5317,6 +5318,19 @@ void Client::SendBuffDurationPacket(Buffs_Struct &buff)
sbf->slotid = 0; sbf->slotid = 0;
sbf->level = buff.casterlevel > 0 ? buff.casterlevel : GetLevel(); sbf->level = buff.casterlevel > 0 ? buff.casterlevel : GetLevel();
// We really don't know what to send as sbf->effect.
// The code used to send level (and still does for cases we don't know)
//
// The fixes below address known issues with sending level in this field.
// Typically, when the packet is sent, or when the user
// next does something on the UI that causes an update (like opening a
// pack), the stats updated by the spell in question get corrupted.
//
// The values were determined by trial and error. I could not find a
// pattern or find a field in spells_new that would work.
sbf->effect=sbf->level;
if (IsEffectInSpell(buff.spellid, SE_TotalHP)) if (IsEffectInSpell(buff.spellid, SE_TotalHP))
{ {
// If any of the lower 6 bits are set, the GUI changes MAX_HP AGAIN. // If any of the lower 6 bits are set, the GUI changes MAX_HP AGAIN.
@ -5327,25 +5341,45 @@ void Client::SendBuffDurationPacket(Buffs_Struct &buff)
else if (IsEffectInSpell(buff.spellid, SE_CurrentHP)) else if (IsEffectInSpell(buff.spellid, SE_CurrentHP))
{ {
// This is mostly a problem when we try and update duration on a // This is mostly a problem when we try and update duration on a
// dot or a hp->mana conversion. Zero cancels the effect, any // dot or a hp->mana conversion. Zero cancels the effect
// other value has the GUI doing that value at the same time server // Sending teh actual change again seems to work.
// is doing theirs. This makes the two match. index = GetSpellEffectIndex(buff.spellid, SE_CurrentHP);
int index = GetSpellEffectIndex(buff.spellid, SE_CurrentHP);
sbf->effect = abs(spells[buff.spellid].base[index]); sbf->effect = abs(spells[buff.spellid].base[index]);
} }
else if (IsEffectInSpell(buff.spellid, SE_SeeInvis)) else if (IsEffectInSpell(buff.spellid, SE_SeeInvis))
{ {
// Wish I knew what this sbf->effect field was trying to tell // 10 seems to not break SeeInvis spells. Level,
// the client. 10 seems to not break SeeInvis spells. Level,
// which is what the old client sends breaks the client at at // which is what the old client sends breaks the client at at
// least level 9, maybe more. // least level 9, maybe more.
sbf->effect = 10; sbf->effect = 10;
} }
else else if (IsEffectInSpell(buff.spellid, SE_ArmorClass) ||
IsEffectInSpell(buff.spellid, SE_ResistFire) ||
IsEffectInSpell(buff.spellid, SE_ResistCold) ||
IsEffectInSpell(buff.spellid, SE_ResistPoison) ||
IsEffectInSpell(buff.spellid, SE_ResistDisease) ||
IsEffectInSpell(buff.spellid, SE_ResistMagic) ||
IsEffectInSpell(buff.spellid, SE_STR) ||
IsEffectInSpell(buff.spellid, SE_STA) ||
IsEffectInSpell(buff.spellid, SE_DEX) ||
IsEffectInSpell(buff.spellid, SE_WIS) ||
IsEffectInSpell(buff.spellid, SE_INT) ||
IsEffectInSpell(buff.spellid, SE_AGI))
{ {
// Default to what old code did until we find a better fix for // This seems to work. Previosly stats got corrupted when sending
// other spell lines. // level.
sbf->effect=sbf->level; sbf->effect = 46;
}
else if (IsEffectInSpell(buff.spellid, SE_CHA))
{
index = GetSpellEffectIndex(buff.spellid, SE_CHA);
sbf->effect = abs(spells[buff.spellid].base[index]);
// Only use this valie if its not a spacer.
if (sbf->effect != 0)
{
// Same as other stats, need this to prevent a double update.
sbf->effect = 46;
}
} }
sbf->bufffade = 0; sbf->bufffade = 0;