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

Add OP_RemoveTrap support

Browse Source
This commit is contained in:
Michael Cook (mackal) 2017-07-20 14:24:35 -04:00
parent 7d5089f5e8
commit 89bbf05b63
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
zone/client_packet.cpp
View File

@ -323,6 +323,7 @@ void MapOpcodes()
ConnectedOpcodes[OP_RecipesSearch] = &Client::Handle_OP_RecipesSearch; ConnectedOpcodes[OP_RecipesSearch] = &Client::Handle_OP_RecipesSearch;
ConnectedOpcodes[OP_ReloadUI] = &Client::Handle_OP_ReloadUI; ConnectedOpcodes[OP_ReloadUI] = &Client::Handle_OP_ReloadUI;
ConnectedOpcodes[OP_RemoveBlockedBuffs] = &Client::Handle_OP_RemoveBlockedBuffs; ConnectedOpcodes[OP_RemoveBlockedBuffs] = &Client::Handle_OP_RemoveBlockedBuffs;
ConnectedOpcodes[OP_RemoveTrap] = &Client::Handle_OP_RemoveTrap;
ConnectedOpcodes[OP_Report] = &Client::Handle_OP_Report; ConnectedOpcodes[OP_Report] = &Client::Handle_OP_Report;
ConnectedOpcodes[OP_RequestDuel] = &Client::Handle_OP_RequestDuel; ConnectedOpcodes[OP_RequestDuel] = &Client::Handle_OP_RequestDuel;
ConnectedOpcodes[OP_RequestTitles] = &Client::Handle_OP_RequestTitles; ConnectedOpcodes[OP_RequestTitles] = &Client::Handle_OP_RequestTitles;
@ -11795,6 +11796,18 @@ void Client::Handle_OP_RemoveBlockedBuffs(const EQApplicationPacket *app)
} }
} }
void Client::Handle_OP_RemoveTrap(const EQApplicationPacket *app)
{
if (app->size != 4) {// just an int
Log(Logs::General, Logs::None, "Size mismatch in OP_RemoveTrap expected 4 got %i", app->size);
DumpPacket(app);
return;
}
auto id = app->ReadUInt32(0);
RemoveAura(id);
}
void Client::Handle_OP_Report(const EQApplicationPacket *app) void Client::Handle_OP_Report(const EQApplicationPacket *app)
{ {
if (!CanUseReport) if (!CanUseReport)
@ -14315,13 +14328,13 @@ void Client::Handle_OP_VoiceMacroIn(const EQApplicationPacket *app)
void Client::Handle_OP_UpdateAura(const EQApplicationPacket *app) void Client::Handle_OP_UpdateAura(const EQApplicationPacket *app)
{ {
if (app->size < 4) { if (app->size != 4) {
Log(Logs::General, Logs::None, "Size mismatch in OP_UpdateAura"); Log(Logs::General, Logs::None, "Size mismatch in OP_UpdateAura");
return; return;
} }
auto action = *(uint32_t *)app->pBuffer; // action tells us the size auto action = app->ReadUInt32(0); // action tells us the size
switch (action) { switch (action) {
case 2: case 2: // client doesn't send this, but this is what it does
RemoveAllAuras(); RemoveAllAuras();
break; break;
case 1: { case 1: {

1
zone/client_packet.h
View File

@ -236,6 +236,7 @@
void Handle_OP_RecipesSearch(const EQApplicationPacket *app); void Handle_OP_RecipesSearch(const EQApplicationPacket *app);
void Handle_OP_ReloadUI(const EQApplicationPacket *app); void Handle_OP_ReloadUI(const EQApplicationPacket *app);
void Handle_OP_RemoveBlockedBuffs(const EQApplicationPacket *app); void Handle_OP_RemoveBlockedBuffs(const EQApplicationPacket *app);
void Handle_OP_RemoveTrap(const EQApplicationPacket *app);
void Handle_OP_Report(const EQApplicationPacket *app); void Handle_OP_Report(const EQApplicationPacket *app);
void Handle_OP_RequestDuel(const EQApplicationPacket *app); void Handle_OP_RequestDuel(const EQApplicationPacket *app);
void Handle_OP_RequestTitles(const EQApplicationPacket *app); void Handle_OP_RequestTitles(const EQApplicationPacket *app);