mirror of
https://github.com/EQEmu/Server.git
synced 2025-12-12 09:31:30 +00:00
[Bug] Anon players should not show in /who all (#4392)
Updated to properly filter anon players from /who all. The code formatting was very inconsistant and needed cleanup.
This commit is contained in:
Fryguy
GitHub
parent
ae213a4e4b
commit
7362c0ebb5
@ -528,276 +528,321 @@ void ClientList::SendOnlineGuildMembers(uint32 FromID, uint32 GuildID)
|
|||||||
safe_delete(pack);
|
safe_delete(pack);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void ClientList::SendWhoAll(uint32 fromid,const char* to, int16 admin, Who_All_Struct* whom, WorldTCPConnection* connection) {
|
void ClientList::SendWhoAll(uint32 fromid,const char* to, int16 admin, Who_All_Struct* whom, WorldTCPConnection* connection) {
|
||||||
try{
|
try {
|
||||||
LinkedListIterator<ClientListEntry*> iterator(clientlist);
|
LinkedListIterator<ClientListEntry*> iterator(clientlist);
|
||||||
LinkedListIterator<ClientListEntry*> countclients(clientlist);
|
LinkedListIterator<ClientListEntry*> countclients(clientlist);
|
||||||
ClientListEntry* cle = 0;
|
ClientListEntry* cle = 0;
|
||||||
ClientListEntry* countcle = 0;
|
ClientListEntry* countcle = 0;
|
||||||
//char tmpgm[25] = "";
|
//char tmpgm[25] = "";
|
||||||
//char accinfo[150] = "";
|
//char accinfo[150] = "";
|
||||||
char line[300] = "";
|
char line[300] = "";
|
||||||
//char tmpguild[50] = "";
|
//char tmpguild[50] = "";
|
||||||
//char LFG[10] = "";
|
//char LFG[10] = "";
|
||||||
//uint32 x = 0;
|
//uint32 x = 0;
|
||||||
int whomlen = 0;
|
int whomlen = 0;
|
||||||
if (whom) {
|
|
||||||
// fixes for client converting some queries into a race query instead of zone
|
|
||||||
if (whom->wrace == 221) {
|
|
||||||
whom->wrace = 0xFFFF;
|
|
||||||
strcpy(whom->whom, "scarlet");
|
|
||||||
}
|
|
||||||
if (whom->wrace == 327) {
|
|
||||||
whom->wrace = 0xFFFF;
|
|
||||||
strcpy(whom->whom, "crystal");
|
|
||||||
}
|
|
||||||
if (whom->wrace == 103) {
|
|
||||||
whom->wrace = 0xFFFF;
|
|
||||||
strcpy(whom->whom, "kedge");
|
|
||||||
}
|
|
||||||
if (whom->wrace == 230) {
|
|
||||||
whom->wrace = 0xFFFF;
|
|
||||||
strcpy(whom->whom, "akheva");
|
|
||||||
}
|
|
||||||
if (whom->wrace == 229) {
|
|
||||||
whom->wrace = 0xFFFF;
|
|
||||||
strcpy(whom->whom, "netherbian");
|
|
||||||
}
|
|
||||||
|
|
||||||
whomlen = strlen(whom->whom);
|
if (whom) {
|
||||||
if(whom->wrace == 0x001A) // 0x001A is the old Froglok race number and is sent by the client for /who all froglok
|
// fixes for client converting some queries into a race query instead of zone
|
||||||
whom->wrace = FROGLOK; // This is what EQEmu uses for the Froglok Race number.
|
if (whom->wrace == 221) {
|
||||||
}
|
whom->wrace = 0xFFFF;
|
||||||
|
strcpy(whom->whom, "scarlet");
|
||||||
uint32 totalusers=0;
|
|
||||||
uint32 totallength=0;
|
|
||||||
countclients.Reset();
|
|
||||||
while(countclients.MoreElements()){
|
|
||||||
countcle = countclients.GetData();
|
|
||||||
const char* tmpZone = ZoneName(countcle->zone());
|
|
||||||
if (
|
|
||||||
(countcle->Online() >= CLE_Status::Zoning) &&
|
|
||||||
(!countcle->GetGM() || countcle->Anon() != 1 || admin >= countcle->Admin()) &&
|
|
||||||
(whom == 0 || (
|
|
||||||
((countcle->Admin() >= AccountStatus::QuestTroupe && countcle->GetGM()) || whom->gmlookup == 0xFFFF) &&
|
|
||||||
(whom->lvllow == 0xFFFF || (countcle->level() >= whom->lvllow && countcle->level() <= whom->lvlhigh && (countcle->Anon()==0 || admin > countcle->Admin()))) &&
|
|
||||||
(whom->wclass == 0xFFFF || (countcle->class_() == whom->wclass && (countcle->Anon()==0 || admin > countcle->Admin()))) &&
|
|
||||||
(whom->wrace == 0xFFFF || (countcle->race() == whom->wrace && (countcle->Anon()==0 || admin > countcle->Admin()))) &&
|
|
||||||
(whomlen == 0 || (
|
|
||||||
(tmpZone != 0 && strncasecmp(tmpZone, whom->whom, whomlen) == 0) ||
|
|
||||||
strncasecmp(countcle->name(),whom->whom, whomlen) == 0 ||
|
|
||||||
(strncasecmp(guild_mgr.GetGuildName(countcle->GuildID()), whom->whom, whomlen) == 0) ||
|
|
||||||
(admin >= AccountStatus::GMAdmin && strncasecmp(countcle->AccountName(), whom->whom, whomlen) == 0)
|
|
||||||
))
|
|
||||||
))
|
|
||||||
) {
|
|
||||||
if((countcle->Anon()>0 && admin >= countcle->Admin() && admin > AccountStatus::Player) || countcle->Anon()==0 ){
|
|
||||||
totalusers++;
|
|
||||||
if(totalusers<=20 || admin >= AccountStatus::GMAdmin)
|
|
||||||
totallength=totallength+strlen(countcle->name())+strlen(countcle->AccountName())+strlen(guild_mgr.GetGuildName(countcle->GuildID()))+5;
|
|
||||||
}
|
}
|
||||||
else if((countcle->Anon()>0 && admin<=countcle->Admin()) || (countcle->Anon()==0 && !countcle->GetGM())) {
|
|
||||||
totalusers++;
|
if (whom->wrace == 327) {
|
||||||
if(totalusers<=20 || admin >= AccountStatus::GMAdmin)
|
whom->wrace = 0xFFFF;
|
||||||
totallength=totallength+strlen(countcle->name())+strlen(guild_mgr.GetGuildName(countcle->GuildID()))+5;
|
strcpy(whom->whom, "crystal");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (whom->wrace == 103) {
|
||||||
|
whom->wrace = 0xFFFF;
|
||||||
|
strcpy(whom->whom, "kedge");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (whom->wrace == 230) {
|
||||||
|
whom->wrace = 0xFFFF;
|
||||||
|
strcpy(whom->whom, "akheva");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (whom->wrace == 229) {
|
||||||
|
whom->wrace = 0xFFFF;
|
||||||
|
strcpy(whom->whom, "netherbian");
|
||||||
|
}
|
||||||
|
|
||||||
|
whomlen = strlen(whom->whom);
|
||||||
|
|
||||||
|
if (whom->wrace == 0x001A) { // 0x001A is the old Froglok race number and is sent by the client for /who all froglok
|
||||||
|
whom->wrace = FROGLOK; // This is what EQEmu uses for the Froglok Race number.
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
countclients.Advance();
|
|
||||||
}
|
|
||||||
uint32 plid=fromid;
|
|
||||||
uint32 playerineqstring=5001;
|
|
||||||
const char line2[]="---------------------------";
|
|
||||||
uint8 unknown35=0x0A;
|
|
||||||
uint32 unknown36=0;
|
|
||||||
uint32 playersinzonestring=5028;
|
|
||||||
if(totalusers>20 && admin<AccountStatus::GMAdmin){
|
|
||||||
totalusers=20;
|
|
||||||
playersinzonestring=5033;
|
|
||||||
}
|
|
||||||
else if(totalusers>1)
|
|
||||||
playersinzonestring=5036;
|
|
||||||
uint32 unknown44[2];
|
|
||||||
unknown44[0]=0;
|
|
||||||
unknown44[1]=0;
|
|
||||||
uint32 unknown52=totalusers;
|
|
||||||
uint32 unknown56=1;
|
|
||||||
auto pack2 = new ServerPacket(ServerOP_WhoAllReply, 64 + totallength + (49 * totalusers));
|
|
||||||
memset(pack2->pBuffer,0,pack2->size);
|
|
||||||
uchar *buffer=pack2->pBuffer;
|
|
||||||
uchar *bufptr=buffer;
|
|
||||||
//memset(buffer,0,pack2->size);
|
|
||||||
memcpy(bufptr,&plid, sizeof(uint32));
|
|
||||||
bufptr+=sizeof(uint32);
|
|
||||||
memcpy(bufptr,&playerineqstring, sizeof(uint32));
|
|
||||||
bufptr+=sizeof(uint32);
|
|
||||||
memcpy(bufptr,&line2, strlen(line2));
|
|
||||||
bufptr+=strlen(line2);
|
|
||||||
memcpy(bufptr,&unknown35, sizeof(uint8));
|
|
||||||
bufptr+=sizeof(uint8);
|
|
||||||
memcpy(bufptr,&unknown36, sizeof(uint32));
|
|
||||||
bufptr+=sizeof(uint32);
|
|
||||||
memcpy(bufptr,&playersinzonestring, sizeof(uint32));
|
|
||||||
bufptr+=sizeof(uint32);
|
|
||||||
memcpy(bufptr,&unknown44[0], sizeof(uint32));
|
|
||||||
bufptr+=sizeof(uint32);
|
|
||||||
memcpy(bufptr,&unknown44[1], sizeof(uint32));
|
|
||||||
bufptr+=sizeof(uint32);
|
|
||||||
memcpy(bufptr,&unknown52, sizeof(uint32));
|
|
||||||
bufptr+=sizeof(uint32);
|
|
||||||
memcpy(bufptr,&unknown56, sizeof(uint32));
|
|
||||||
bufptr+=sizeof(uint32);
|
|
||||||
memcpy(bufptr,&totalusers, sizeof(uint32));
|
|
||||||
bufptr+=sizeof(uint32);
|
|
||||||
|
|
||||||
iterator.Reset();
|
uint32 totalusers=0;
|
||||||
int idx=-1;
|
uint32 totallength=0;
|
||||||
while(iterator.MoreElements()) {
|
countclients.Reset();
|
||||||
cle = iterator.GetData();
|
while (countclients.MoreElements()) {
|
||||||
const char* tmpZone = ZoneName(cle->zone());
|
countcle = countclients.GetData();
|
||||||
|
const char* tmpZone = ZoneName(countcle->zone());
|
||||||
|
if (
|
||||||
|
(countcle->Online() >= CLE_Status::Zoning) &&
|
||||||
|
(!countcle->GetGM() || countcle->Anon() != 1 || admin >= countcle->Admin()) &&
|
||||||
|
(whom == 0 || (
|
||||||
|
((countcle->Admin() >= AccountStatus::QuestTroupe && countcle->GetGM()) || whom->gmlookup == 0xFFFF) &&
|
||||||
|
(whom->lvllow == 0xFFFF ||
|
||||||
|
(countcle->level() >= whom->lvllow && countcle->level() <= whom->lvlhigh &&
|
||||||
|
(countcle->Anon() == 0 || admin > countcle->Admin()))) &&
|
||||||
|
(whom->wclass == 0xFFFF || (countcle->class_() == whom->wclass &&
|
||||||
|
(countcle->Anon() == 0 || admin > countcle->Admin()))) &&
|
||||||
|
(whom->wrace == 0xFFFF ||
|
||||||
|
(countcle->race() == whom->wrace && (countcle->Anon() == 0 || admin > countcle->Admin()))) &&
|
||||||
|
(whomlen == 0 || (
|
||||||
|
(tmpZone != 0 && strncasecmp(tmpZone, whom->whom, whomlen) == 0) ||
|
||||||
|
strncasecmp(countcle->name(),whom->whom, whomlen) == 0 ||
|
||||||
|
(strncasecmp(guild_mgr.GetGuildName(countcle->GuildID()), whom->whom, whomlen) == 0) ||
|
||||||
|
(admin >= AccountStatus::GMAdmin && strncasecmp(countcle->AccountName(), whom->whom, whomlen) == 0)
|
||||||
|
))
|
||||||
|
))
|
||||||
|
) {
|
||||||
|
// these blocks can all be condensed but it's simpler to conceptualize this way
|
||||||
|
if ((countcle->Anon()>0 && admin >= countcle->Admin() && admin > AccountStatus::Player) || countcle->Anon()==0 ) {
|
||||||
|
totalusers++;
|
||||||
|
if (totalusers<=20 || admin >= AccountStatus::GMAdmin) {
|
||||||
|
totallength = totallength + strlen(countcle->name()) + strlen(countcle->AccountName()) +
|
||||||
|
strlen(guild_mgr.GetGuildName(countcle->GuildID())) + 5;
|
||||||
|
}
|
||||||
|
} else if (((countcle->Anon() == 1 && admin <= countcle->Admin()) && whomlen != 0 &&
|
||||||
|
strncasecmp(countcle->name(), whom->whom, whomlen) == 0)) {
|
||||||
|
totalusers++;
|
||||||
|
if (totalusers <= 20 || admin >= AccountStatus::GMAdmin) {
|
||||||
|
totallength = totallength + strlen(countcle->name()) + strlen(countcle->AccountName()) +
|
||||||
|
strlen(guild_mgr.GetGuildName(countcle->GuildID())) + 5;
|
||||||
|
}
|
||||||
|
} else if (((countcle->Anon() == 2 && admin <= countcle->Admin()) && whomlen != 0 &&
|
||||||
|
(strncasecmp(countcle->name(), whom->whom, whomlen) == 0 ||
|
||||||
|
strncasecmp(guild_mgr.GetGuildName(countcle->GuildID()), whom->whom, whomlen) == 0))) {
|
||||||
|
totalusers++;
|
||||||
|
if (totalusers <= 20 || admin >= AccountStatus::GMAdmin) {
|
||||||
|
totallength = totallength + strlen(countcle->name()) + strlen(countcle->AccountName()) +
|
||||||
|
strlen(guild_mgr.GetGuildName(countcle->GuildID())) + 5;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
countclients.Advance();
|
||||||
|
}
|
||||||
|
|
||||||
if (
|
uint32 plid=fromid;
|
||||||
(cle->Online() >= CLE_Status::Zoning) &&
|
uint32 playerineqstring=5001;
|
||||||
(!cle->GetGM() || cle->Anon() != 1 || admin >= cle->Admin()) &&
|
const char line2[]="---------------------------";
|
||||||
(whom == 0 || (
|
uint8 unknown35=0x0A;
|
||||||
((cle->Admin() >= AccountStatus::QuestTroupe && cle->GetGM()) || whom->gmlookup == 0xFFFF) &&
|
uint32 unknown36=0;
|
||||||
(whom->lvllow == 0xFFFF || (cle->level() >= whom->lvllow && cle->level() <= whom->lvlhigh && (cle->Anon()==0 || admin>cle->Admin()))) &&
|
uint32 playersinzonestring=5028;
|
||||||
(whom->wclass == 0xFFFF || (cle->class_() == whom->wclass && (cle->Anon()==0 || admin>cle->Admin()))) &&
|
|
||||||
(whom->wrace == 0xFFFF || (cle->race() == whom->wrace && (cle->Anon()==0 || admin>cle->Admin()))) &&
|
if (totalusers>20 && admin<AccountStatus::GMAdmin) {
|
||||||
(whomlen == 0 || (
|
totalusers=20;
|
||||||
(tmpZone != 0 && strncasecmp(tmpZone, whom->whom, whomlen) == 0) ||
|
playersinzonestring=5033;
|
||||||
strncasecmp(cle->name(),whom->whom, whomlen) == 0 ||
|
} else if(totalusers>1) {
|
||||||
(strncasecmp(guild_mgr.GetGuildName(cle->GuildID()), whom->whom, whomlen) == 0) ||
|
playersinzonestring=5036;
|
||||||
(admin >= AccountStatus::GMAdmin && strncasecmp(cle->AccountName(), whom->whom, whomlen) == 0)
|
}
|
||||||
))
|
|
||||||
))
|
uint32 unknown44[2];
|
||||||
) {
|
unknown44[0]=0;
|
||||||
line[0] = 0;
|
unknown44[1]=0;
|
||||||
uint32 rankstring = 0xFFFFFFFF;
|
uint32 unknown52=totalusers;
|
||||||
if((cle->Anon()==1 && cle->GetGM() && cle->Admin()>admin) || (idx>=20 && admin < AccountStatus::GMAdmin)){ //hide gms that are anon from lesser gms and normal players, cut off at 20
|
uint32 unknown56=1;
|
||||||
|
auto pack2 = new ServerPacket(ServerOP_WhoAllReply, 64 + totallength + (49 * totalusers));
|
||||||
|
memset(pack2->pBuffer,0,pack2->size);
|
||||||
|
uchar *buffer=pack2->pBuffer;
|
||||||
|
uchar *bufptr=buffer;
|
||||||
|
//memset(buffer,0,pack2->size);
|
||||||
|
memcpy(bufptr,&plid, sizeof(uint32));
|
||||||
|
bufptr+=sizeof(uint32);
|
||||||
|
memcpy(bufptr,&playerineqstring, sizeof(uint32));
|
||||||
|
bufptr+=sizeof(uint32);
|
||||||
|
memcpy(bufptr,&line2, strlen(line2));
|
||||||
|
bufptr+=strlen(line2);
|
||||||
|
memcpy(bufptr,&unknown35, sizeof(uint8));
|
||||||
|
bufptr+=sizeof(uint8);
|
||||||
|
memcpy(bufptr,&unknown36, sizeof(uint32));
|
||||||
|
bufptr+=sizeof(uint32);
|
||||||
|
memcpy(bufptr,&playersinzonestring, sizeof(uint32));
|
||||||
|
bufptr+=sizeof(uint32);
|
||||||
|
memcpy(bufptr,&unknown44[0], sizeof(uint32));
|
||||||
|
bufptr+=sizeof(uint32);
|
||||||
|
memcpy(bufptr,&unknown44[1], sizeof(uint32));
|
||||||
|
bufptr+=sizeof(uint32);
|
||||||
|
memcpy(bufptr,&unknown52, sizeof(uint32));
|
||||||
|
bufptr+=sizeof(uint32);
|
||||||
|
memcpy(bufptr,&unknown56, sizeof(uint32));
|
||||||
|
bufptr+=sizeof(uint32);
|
||||||
|
memcpy(bufptr,&totalusers, sizeof(uint32));
|
||||||
|
bufptr+=sizeof(uint32);
|
||||||
|
|
||||||
|
iterator.Reset();
|
||||||
|
int idx=-1;
|
||||||
|
while(iterator.MoreElements()) {
|
||||||
|
cle = iterator.GetData();
|
||||||
|
const char* tmpZone = ZoneName(cle->zone());
|
||||||
|
|
||||||
|
if (
|
||||||
|
(cle->Online() >= CLE_Status::Zoning) &&
|
||||||
|
(!cle->GetGM() || cle->Anon() != 1 || admin >= cle->Admin()) &&
|
||||||
|
(whom == 0 || (
|
||||||
|
((cle->Admin() >= AccountStatus::QuestTroupe && cle->GetGM()) || whom->gmlookup == 0xFFFF) &&
|
||||||
|
(whom->lvllow == 0xFFFF || (cle->level() >= whom->lvllow && cle->level() <= whom->lvlhigh && (cle->Anon()==0 || admin>cle->Admin()))) &&
|
||||||
|
(whom->wclass == 0xFFFF || (cle->class_() == whom->wclass && (cle->Anon()==0 || admin>cle->Admin()))) &&
|
||||||
|
(whom->wrace == 0xFFFF || (cle->race() == whom->wrace && (cle->Anon()==0 || admin>cle->Admin()))) &&
|
||||||
|
(whomlen == 0 || (
|
||||||
|
(tmpZone != 0 && strncasecmp(tmpZone, whom->whom, whomlen) == 0) ||
|
||||||
|
strncasecmp(cle->name(),whom->whom, whomlen) == 0 ||
|
||||||
|
(strncasecmp(guild_mgr.GetGuildName(cle->GuildID()), whom->whom, whomlen) == 0) ||
|
||||||
|
(admin >= AccountStatus::GMAdmin && strncasecmp(cle->AccountName(), whom->whom, whomlen) == 0)
|
||||||
|
))
|
||||||
|
))
|
||||||
|
) {
|
||||||
|
line[0] = 0;
|
||||||
|
uint32 rankstring = 0xFFFFFFFF;
|
||||||
|
// These lines can be simplified but easier to conceptualize this way
|
||||||
|
if ((cle->Anon()==1 && cle->GetGM() && cle->Admin()>admin) || (idx>=20 && admin < AccountStatus::GMAdmin)) { //hide gms that are anon from lesser gms and normal players, cut off at 20
|
||||||
|
rankstring = 0;
|
||||||
|
iterator.Advance();
|
||||||
|
continue;
|
||||||
|
} else if (cle->Anon() == 1 && cle->Admin()>=admin && (whomlen == 0 || (whomlen !=0 && strncasecmp(cle->name(), whom->whom, whomlen) != 0))) {
|
||||||
|
rankstring = 0;
|
||||||
|
iterator.Advance();
|
||||||
|
continue;
|
||||||
|
} else if (cle->Anon() == 2 && cle->Admin()>=admin && (whomlen == 0 || (whomlen !=0 && strncasecmp(cle->name(), whom->whom, whomlen) != 0 && strncasecmp(guild_mgr.GetGuildName(cle->GuildID()), whom->whom, whomlen) != 0))) {
|
||||||
rankstring = 0;
|
rankstring = 0;
|
||||||
iterator.Advance();
|
iterator.Advance();
|
||||||
continue;
|
continue;
|
||||||
} else if (cle->GetGM()) {
|
} else if (cle->GetGM()) {
|
||||||
if (cle->Admin() >= AccountStatus::GMImpossible)
|
if (cle->Admin() >= AccountStatus::GMImpossible) {
|
||||||
rankstring = 5021;
|
rankstring = 5021;
|
||||||
else if (cle->Admin() >= AccountStatus::GMMgmt)
|
} else if (cle->Admin() >= AccountStatus::GMMgmt) {
|
||||||
rankstring = 5020;
|
rankstring = 5020;
|
||||||
else if (cle->Admin() >= AccountStatus::GMCoder)
|
} else if (cle->Admin() >= AccountStatus::GMCoder) {
|
||||||
rankstring = 5019;
|
rankstring = 5019;
|
||||||
else if (cle->Admin() >= AccountStatus::GMAreas)
|
} else if (cle->Admin() >= AccountStatus::GMAreas) {
|
||||||
rankstring = 5018;
|
rankstring = 5018;
|
||||||
else if (cle->Admin() >= AccountStatus::QuestMaster)
|
} else if (cle->Admin() >= AccountStatus::QuestMaster) {
|
||||||
rankstring = 5017;
|
rankstring = 5017;
|
||||||
else if (cle->Admin() >= AccountStatus::GMLeadAdmin)
|
} else if (cle->Admin() >= AccountStatus::GMLeadAdmin) {
|
||||||
rankstring = 5016;
|
rankstring = 5016;
|
||||||
else if (cle->Admin() >= AccountStatus::GMAdmin)
|
} else if (cle->Admin() >= AccountStatus::GMAdmin) {
|
||||||
rankstring = 5015;
|
rankstring = 5015;
|
||||||
else if (cle->Admin() >= AccountStatus::GMStaff)
|
} else if (cle->Admin() >= AccountStatus::GMStaff) {
|
||||||
rankstring = 5014;
|
rankstring = 5014;
|
||||||
else if (cle->Admin() >= AccountStatus::EQSupport)
|
} else if (cle->Admin() >= AccountStatus::EQSupport) {
|
||||||
rankstring = 5013;
|
rankstring = 5013;
|
||||||
else if (cle->Admin() >= AccountStatus::GMTester)
|
} else if (cle->Admin() >= AccountStatus::GMTester) {
|
||||||
rankstring = 5012;
|
rankstring = 5012;
|
||||||
else if (cle->Admin() >= AccountStatus::SeniorGuide)
|
} else if (cle->Admin() >= AccountStatus::SeniorGuide) {
|
||||||
rankstring = 5011;
|
rankstring = 5011;
|
||||||
else if (cle->Admin() >= AccountStatus::QuestTroupe)
|
} else if (cle->Admin() >= AccountStatus::QuestTroupe) {
|
||||||
rankstring = 5010;
|
rankstring = 5010;
|
||||||
else if (cle->Admin() >= AccountStatus::Guide)
|
} else if (cle->Admin() >= AccountStatus::Guide) {
|
||||||
rankstring = 5009;
|
rankstring = 5009;
|
||||||
else if (cle->Admin() >= AccountStatus::ApprenticeGuide)
|
} else if (cle->Admin() >= AccountStatus::ApprenticeGuide) {
|
||||||
rankstring = 5008;
|
rankstring = 5008;
|
||||||
else if (cle->Admin() >= AccountStatus::Steward)
|
} else if (cle->Admin() >= AccountStatus::Steward) {
|
||||||
rankstring = 5007;
|
rankstring = 5007;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
idx++;
|
|
||||||
char guildbuffer[67]={0};
|
|
||||||
if (cle->GuildID() != GUILD_NONE && cle->GuildID()>0)
|
|
||||||
sprintf(guildbuffer,"<%s>", guild_mgr.GetGuildName(cle->GuildID()));
|
|
||||||
uint32 formatstring=5025;
|
|
||||||
if(cle->Anon()==1 && (admin<cle->Admin() || admin == AccountStatus::Player))
|
|
||||||
formatstring=5024;
|
|
||||||
else if(cle->Anon()==1 && admin>=cle->Admin() && admin > AccountStatus::Player)
|
|
||||||
formatstring=5022;
|
|
||||||
else if(cle->Anon()==2 && (admin<cle->Admin() || admin == AccountStatus::Player))
|
|
||||||
formatstring=5023;//display guild
|
|
||||||
else if(cle->Anon()==2 && admin>=cle->Admin() && admin > AccountStatus::Player)
|
|
||||||
formatstring=5022;//display everything
|
|
||||||
|
|
||||||
//war* wars2 = (war*)pack2->pBuffer;
|
idx++;
|
||||||
|
char guildbuffer[67]={0};
|
||||||
|
|
||||||
uint32 plclass_=0;
|
if (cle->GuildID() != GUILD_NONE && cle->GuildID()>0) {
|
||||||
uint32 pllevel=0;
|
sprintf(guildbuffer,"<%s>", guild_mgr.GetGuildName(cle->GuildID()));
|
||||||
uint32 pidstring=0xFFFFFFFF;//5003;
|
}
|
||||||
uint32 plrace=0;
|
|
||||||
uint32 zonestring=0xFFFFFFFF;
|
|
||||||
uint32 plzone=0;
|
|
||||||
uint32 unknown80[2];
|
|
||||||
if(cle->Anon()==0 || (admin>=cle->Admin() && admin> AccountStatus::Player)){
|
|
||||||
plclass_=cle->class_();
|
|
||||||
pllevel=cle->level();
|
|
||||||
if(admin>=AccountStatus::GMAdmin)
|
|
||||||
pidstring=5003;
|
|
||||||
plrace=cle->race();
|
|
||||||
zonestring=5006;
|
|
||||||
plzone=cle->zone();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
uint32 formatstring=5025;
|
||||||
|
|
||||||
if(admin>=cle->Admin() && admin > AccountStatus::Player)
|
if (cle->Anon()==1 && (admin<cle->Admin() || admin == AccountStatus::Player)) {
|
||||||
unknown80[0]=cle->Admin();
|
formatstring=5024;
|
||||||
else
|
} else if(cle->Anon()==1 && admin>=cle->Admin() && admin > AccountStatus::Player) {
|
||||||
unknown80[0]=0xFFFFFFFF;
|
formatstring=5022;
|
||||||
unknown80[1]=0xFFFFFFFF;//1035
|
} else if(cle->Anon()==2 && (admin<cle->Admin() || admin == AccountStatus::Player)) {
|
||||||
|
formatstring=5023;//display guild
|
||||||
|
} else if(cle->Anon()==2 && admin>=cle->Admin() && admin > AccountStatus::Player) {
|
||||||
|
formatstring=5022;//display everything
|
||||||
|
}
|
||||||
|
|
||||||
|
//war* wars2 = (war*)pack2->pBuffer;
|
||||||
|
|
||||||
//char plstatus[20]={0};
|
uint32 plclass_=0;
|
||||||
//sprintf(plstatus, "Status %i",cle->Admin());
|
uint32 pllevel=0;
|
||||||
char plname[64]={0};
|
uint32 pidstring=0xFFFFFFFF;//5003;
|
||||||
strcpy(plname,cle->name());
|
uint32 plrace=0;
|
||||||
|
uint32 zonestring=0xFFFFFFFF;
|
||||||
|
uint32 plzone=0;
|
||||||
|
uint32 unknown80[2];
|
||||||
|
|
||||||
char placcount[30]={0};
|
if (cle->Anon()==0 || (admin>=cle->Admin() && admin> AccountStatus::Player)) {
|
||||||
if(admin>=cle->Admin() && admin > AccountStatus::Player)
|
plclass_=cle->class_();
|
||||||
strcpy(placcount,cle->AccountName());
|
pllevel=cle->level();
|
||||||
|
|
||||||
memcpy(bufptr,&formatstring, sizeof(uint32));
|
if(admin>=AccountStatus::GMAdmin) {
|
||||||
bufptr+=sizeof(uint32);
|
pidstring=5003;
|
||||||
memcpy(bufptr,&pidstring, sizeof(uint32));
|
}
|
||||||
bufptr+=sizeof(uint32);
|
plrace=cle->race();
|
||||||
memcpy(bufptr,&plname, strlen(plname)+1);
|
zonestring=5006;
|
||||||
bufptr+=strlen(plname)+1;
|
plzone=cle->zone();
|
||||||
memcpy(bufptr,&rankstring, sizeof(uint32));
|
}
|
||||||
bufptr+=sizeof(uint32);
|
|
||||||
memcpy(bufptr,&guildbuffer, strlen(guildbuffer)+1);
|
if (admin>=cle->Admin() && admin > AccountStatus::Player) {
|
||||||
bufptr+=strlen(guildbuffer)+1;
|
unknown80[0]=cle->Admin();
|
||||||
memcpy(bufptr,&unknown80[0], sizeof(uint32));
|
} else {
|
||||||
bufptr+=sizeof(uint32);
|
unknown80[0]=0xFFFFFFFF;
|
||||||
memcpy(bufptr,&unknown80[1], sizeof(uint32));
|
}
|
||||||
bufptr+=sizeof(uint32);
|
|
||||||
memcpy(bufptr,&zonestring, sizeof(uint32));
|
unknown80[1]=0xFFFFFFFF;//1035
|
||||||
bufptr+=sizeof(uint32);
|
|
||||||
memcpy(bufptr,&plzone, sizeof(uint32));
|
//char plstatus[20]={0};
|
||||||
bufptr+=sizeof(uint32);
|
//sprintf(plstatus, "Status %i",cle->Admin());
|
||||||
memcpy(bufptr,&plclass_, sizeof(uint32));
|
char plname[64]={0};
|
||||||
bufptr+=sizeof(uint32);
|
strcpy(plname,cle->name());
|
||||||
memcpy(bufptr,&pllevel, sizeof(uint32));
|
|
||||||
bufptr+=sizeof(uint32);
|
char placcount[30]={0};
|
||||||
memcpy(bufptr,&plrace, sizeof(uint32));
|
if (admin>=cle->Admin() && admin > AccountStatus::Player) {
|
||||||
bufptr+=sizeof(uint32);
|
strcpy(placcount,cle->AccountName());
|
||||||
uint32 ending=0;
|
}
|
||||||
memcpy(bufptr,&placcount, strlen(placcount)+1);
|
|
||||||
bufptr+=strlen(placcount)+1;
|
memcpy(bufptr,&formatstring, sizeof(uint32));
|
||||||
ending=207;
|
bufptr+=sizeof(uint32);
|
||||||
memcpy(bufptr,&ending, sizeof(uint32));
|
memcpy(bufptr,&pidstring, sizeof(uint32));
|
||||||
bufptr+=sizeof(uint32);
|
bufptr+=sizeof(uint32);
|
||||||
|
memcpy(bufptr,&plname, strlen(plname)+1);
|
||||||
|
bufptr+=strlen(plname)+1;
|
||||||
|
memcpy(bufptr,&rankstring, sizeof(uint32));
|
||||||
|
bufptr+=sizeof(uint32);
|
||||||
|
memcpy(bufptr,&guildbuffer, strlen(guildbuffer)+1);
|
||||||
|
bufptr+=strlen(guildbuffer)+1;
|
||||||
|
memcpy(bufptr,&unknown80[0], sizeof(uint32));
|
||||||
|
bufptr+=sizeof(uint32);
|
||||||
|
memcpy(bufptr,&unknown80[1], sizeof(uint32));
|
||||||
|
bufptr+=sizeof(uint32);
|
||||||
|
memcpy(bufptr,&zonestring, sizeof(uint32));
|
||||||
|
bufptr+=sizeof(uint32);
|
||||||
|
memcpy(bufptr,&plzone, sizeof(uint32));
|
||||||
|
bufptr+=sizeof(uint32);
|
||||||
|
memcpy(bufptr,&plclass_, sizeof(uint32));
|
||||||
|
bufptr+=sizeof(uint32);
|
||||||
|
memcpy(bufptr,&pllevel, sizeof(uint32));
|
||||||
|
bufptr+=sizeof(uint32);
|
||||||
|
memcpy(bufptr,&plrace, sizeof(uint32));
|
||||||
|
bufptr+=sizeof(uint32);
|
||||||
|
uint32 ending=0;
|
||||||
|
memcpy(bufptr,&placcount, strlen(placcount)+1);
|
||||||
|
bufptr+=strlen(placcount)+1;
|
||||||
|
ending=207;
|
||||||
|
memcpy(bufptr,&ending, sizeof(uint32));
|
||||||
|
bufptr+=sizeof(uint32);
|
||||||
|
}
|
||||||
|
iterator.Advance();
|
||||||
}
|
}
|
||||||
iterator.Advance();
|
|
||||||
}
|
SendPacket(to,pack2);
|
||||||
//zoneserver_list.SendPacket(pack2); // NO NO NO WHY WOULD YOU SEND IT TO EVERY ZONE SERVER?!?
|
safe_delete(pack2);
|
||||||
SendPacket(to,pack2);
|
} catch(...) {
|
||||||
safe_delete(pack2);
|
|
||||||
}
|
|
||||||
catch(...){
|
|
||||||
LogInfo("Unknown error in world's SendWhoAll (probably mem error), ignoring");
|
LogInfo("Unknown error in world's SendWhoAll (probably mem error), ignoring");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user