pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-17 03:08:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove assignments in conditions

Browse Source
This commit is contained in:
hg
2020-01-29 18:34:33 -05:00
parent 371265d143
commit 9689787e56
3 changed files with 52 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
world/zoneserver.cpp
+21 -16
View File
@@ -1064,29 +1064,34 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
ServerOP_Consent_Struct* s = (ServerOP_Consent_Struct*)pack->pBuffer;
ZoneServer* owner_zs = nullptr;
if ((s->instance_id != 0 && (owner_zs = zoneserver_list.FindByInstanceID(s->instance_id))) ||
(s->instance_id == 0 && (owner_zs = zoneserver_list.FindByZoneID(s->zone_id))))
{
if (s->instance_id == 0) {
owner_zs = zoneserver_list.FindByZoneID(s->zone_id);
}
else {
owner_zs = zoneserver_list.FindByInstanceID(s->instance_id);
}
if (owner_zs) {
owner_zs->SendPacket(pack);
}
else
{
else {
LogInfo("Unable to locate zone record for zone id [{}] or instance id [{}] in zoneserver list for ServerOP_Consent_Response operation", s->zone_id, s->instance_id);
}
if (s->consent_type == EQEmu::consent::Normal)
{
if (s->consent_type == EQEmu::consent::Normal) {
// send the message to the client being granted or denied permission
if (ClientListEntry* cle = client_list.FindCharacter(s->grantname))
{
ClientListEntry* cle = client_list.FindCharacter(s->grantname);
if (cle) {
ZoneServer* granted_zs = nullptr;
if ((cle->instance() != 0 && (granted_zs = zoneserver_list.FindByInstanceID(cle->instance()))) ||
(cle->instance() == 0 && (granted_zs = zoneserver_list.FindByZoneID(cle->zone()))))
{
// avoid sending twice if owner and granted are in same zone
if (granted_zs != owner_zs) {
granted_zs->SendPacket(pack);
}
if (cle->instance() == 0) {
granted_zs = zoneserver_list.FindByZoneID(cle->zone());
}
else {
granted_zs = zoneserver_list.FindByInstanceID(cle->instance());
}
// avoid sending twice if owner and granted are in same zone
if (granted_zs && granted_zs != owner_zs) {
granted_zs->SendPacket(pack);
}
}
}