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

Only correct spell slots when we're sending to self

Browse Source 
This will fix display issues with lots of buffs on NPCs
This commit is contained in:
Michael Cook (mackal) 2016-08-24 23:15:31 -04:00
parent 3afc5d0890
commit 55d2e9b842
3 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/patches/rof.cpp
View File

@ -477,10 +477,11 @@ namespace RoF
for (uint16 i = 0; i < emu->count; ++i) for (uint16 i = 0; i < emu->count; ++i)
{ {
uint16 buffslot = emu->entries[i].buff_slot; uint16 buffslot = emu->entries[i].buff_slot;
// Not sure if this is needs amending for RoF yet. if (emu->type == 0) { // only correct for self packets
if (emu->entries[i].buff_slot >= 25) if (emu->entries[i].buff_slot >= 25)
{
buffslot += 17; buffslot += 17;
if (buffslot == 54)
buffslot = 62;
} }
__packet->WriteUInt32(buffslot); __packet->WriteUInt32(buffslot);

5
common/patches/rof2.cpp
View File

@ -549,16 +549,15 @@ namespace RoF2
for (uint16 i = 0; i < emu->count; ++i) for (uint16 i = 0; i < emu->count; ++i)
{ {
uint16 buffslot = emu->entries[i].buff_slot; uint16 buffslot = emu->entries[i].buff_slot;
// Not sure if this is needs amending for RoF2 yet. if (emu->type == 0) { // only correct for self packets
if (emu->entries[i].buff_slot >= 25) if (emu->entries[i].buff_slot >= 25)
{
buffslot += 17; buffslot += 17;
}
// TODO: We should really just deal with these "server side" // TODO: We should really just deal with these "server side"
// so we can have clients not limited to other clients. // so we can have clients not limited to other clients.
// This fixes discs, songs were changed to 20 // This fixes discs, songs were changed to 20
if (buffslot == 54) if (buffslot == 54)
buffslot = 62; buffslot = 62;
}
__packet->WriteUInt32(buffslot); __packet->WriteUInt32(buffslot);
__packet->WriteUInt32(emu->entries[i].spell_id); __packet->WriteUInt32(emu->entries[i].spell_id);

4
common/patches/uf.cpp
View File

@ -410,12 +410,10 @@ namespace UF
for (uint16 i = 0; i < emu->count; ++i) for (uint16 i = 0; i < emu->count; ++i)
{ {
uint16 buffslot = emu->entries[i].buff_slot; uint16 buffslot = emu->entries[i].buff_slot;
if (emu->type == 0) { // only correct for self packets
if (emu->entries[i].buff_slot >= 25 && emu->entries[i].buff_slot < 37) if (emu->entries[i].buff_slot >= 25 && emu->entries[i].buff_slot < 37)
{
buffslot += 5; buffslot += 5;
}
else if (emu->entries[i].buff_slot >= 37) else if (emu->entries[i].buff_slot >= 37)
{
buffslot += 14; buffslot += 14;
} }