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

Fix merge issue with Marquee check

Browse Source
This commit is contained in:
Akkadius 2017-04-12 16:26:16 -05:00
parent db64e39651
commit fac75b6f16
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
world/ucs.cpp
View File

@ -36,25 +36,25 @@ void UCSConnection::ProcessPacket(uint16 opcode, EQ::Net::Packet &p)
switch (opcode) switch (opcode)
{ {
case 0: case 0:
break; break;
case ServerOP_KeepAlive: case ServerOP_KeepAlive:
{ {
// ignore this // ignore this
break; break;
} }
case ServerOP_ZAAuth: case ServerOP_ZAAuth:
{ {
Log(Logs::Detail, Logs::UCS_Server, "Got authentication from UCS when they are already authenticated."); Log(Logs::Detail, Logs::UCS_Server, "Got authentication from UCS when they are already authenticated.");
break; break;
} }
default: default:
{ {
Log(Logs::Detail, Logs::UCS_Server, "Unknown ServerOPcode from UCS 0x%04x, size %d", opcode, pack->size); Log(Logs::Detail, Logs::UCS_Server, "Unknown ServerOPcode from UCS 0x%04x, size %d", opcode, pack->size);
DumpPacket(pack->pBuffer, pack->size); DumpPacket(pack->pBuffer, pack->size);
break; break;
} }
} }
} }

2
zone/attack.cpp
View File

@ -3353,7 +3353,7 @@ void Mob::CommonDamage(Mob* attacker, int &damage, const uint16 spell_id, const
SetHP(GetHP() - damage); SetHP(GetHP() - damage);
if (IsClient()) if (IsClient() && RuleB(Character, MarqueeHPUpdates))
this->CastToClient()->SendHPUpdateMarquee(); this->CastToClient()->SendHPUpdateMarquee();
if (HasDied()) { if (HasDied()) {