pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-08-29 16:58:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/EQEmu/Server

Browse Source
This commit is contained in:
KimLS
2013-07-10 14:33:06 -07:00
parent 3992ac02bb e6ad26f03c
commit ab2c184b54
4 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/client_packet.cpp
+2 -4
View File
@@ -446,6 +446,7 @@ int Client::HandlePacket(const EQApplicationPacket *app)
ClientPacketProc p;
p = ConnectedOpcodes[opcode];
if(p == nullptr) {
#if (EQDEBUG>=5)
char buffer[64];
app->build_header_dump(buffer);
mlog(CLIENT__NET_ERR, "Unhandled incoming opcode: %s", buffer);
@@ -455,6 +456,7 @@ int Client::HandlePacket(const EQApplicationPacket *app)
std::cout << "Dump limited to 1000 characters:\n";
DumpPacket(app->pBuffer, 1000);
}
#endif
break;
}
@@ -8548,8 +8550,6 @@ void Client::Handle_OP_FindPersonRequest(const EQApplicationPacket *app)
FindPersonRequest_Struct* t = (FindPersonRequest_Struct*)app->pBuffer;
std::vector<FindPerson_Point> points;
Message(13, "Searched for NPC ID: %d\n", t->npc_id);
Mob* target = entity_list.GetMob(t->npc_id);
if(target == nullptr) {
@@ -8564,8 +8564,6 @@ void Client::Handle_OP_FindPersonRequest(const EQApplicationPacket *app)
Message(15, "Moving you to Trader %s", target->GetName());
MovePC(zone->GetZoneID(), zone->GetInstanceID(), target->GetX(), target->GetY(), target->GetZ() , 0.0f);
}
else
Message(13, "Found NPC '%s'\n", target->GetName());
if(!RuleB(Pathing, Find) || !zone->pathing)
{
zone/zoning.cpp
+1 -1
View File
@@ -642,7 +642,7 @@ void Client::ZonePC(uint32 zoneID, uint32 instance_id, float x, float y, float z
safe_delete(outapp);
}
LogFile->write(EQEMuLog::Debug, "Player %s has requested a zoning to LOC x=%f, y=%f, z=%f, heading=%f in zoneid=%i", GetName(), x, y, z, heading, zoneID);
_log(NET__DEBUG, "Player %s has requested a zoning to LOC x=%f, y=%f, z=%f, heading=%f in zoneid=%i", GetName(), x, y, z, heading, zoneID);
//Clear zonesummon variables if we're zoning to our own zone
//Client wont generate a zone change packet to the server in this case so
//They aren't needed and it keeps behavior on next zone attempt from being undefined.