diff options
| author | Michael <michaelneubert1988@gmail.com> | 2014-05-25 22:25:26 +0200 |
|---|---|---|
| committer | Michael <michaelneubert1988@gmail.com> | 2014-05-25 22:25:26 +0200 |
| commit | 672b8c6e13a0ab1ac296494659712b8fe5aee6bc (patch) | |
| tree | 5400421e352f5fd026f2ac74ed9351f4b153915a | |
| parent | 9df4db15a7a9eb532e21a80dd4199c260da449e3 (diff) | |
Core: Fix merge fail
| -rw-r--r-- | src/server/game/Server/WorldSession.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Server/WorldSession.cpp b/src/server/game/Server/WorldSession.cpp index 7c53022fb14..1f25d8dc693 100644 --- a/src/server/game/Server/WorldSession.cpp +++ b/src/server/game/Server/WorldSession.cpp @@ -222,7 +222,7 @@ void WorldSession::SendPacket(WorldPacket const* packet, bool forced /*= false*/ if (!forced) { - OpcodeHandler const* handler = opcodeTable[packet->GetOpcode()]; + OpcodeHandler const* handler = ].name; if (!handler || handler->Status == STATUS_UNHANDLED) { TC_LOG_ERROR("network.opcode", "Prevented sending disabled opcode %s to %s", GetOpcodeNameForLogging(packet->GetOpcode()).c_str(), GetPlayerInfo().c_str()); @@ -1192,8 +1192,8 @@ bool WorldSession::DosProtection::EvaluateOpcode(WorldPacket& p, time_t time) co if (++packetCounter.amountCounter > maxPacketCounterAllowed) { dosTriggered = true; - TC_LOG_WARN("network", "AntiDOS: Account %u, IP: %s, flooding packet (opc: %u, count: %u)", - Session->GetAccountId(), Session->GetRemoteAddress().c_str(), p.GetOpcode(), packetCounter.amountCounter); + TC_LOG_WARN("network", "AntiDOS: Account %u, IP: %s, flooding packet (opc: %s (0x%X), count: %u)", + Session->GetAccountId(), Session->GetRemoteAddress().c_str(), opcodeTable[p.GetOpcode()]->Name, p.GetOpcode(), packetCounter.amountCounter); } // Then check if player is sending packets not allowed |