From c796fc8212bb7e69933894022bac63a7f69e846c Mon Sep 17 00:00:00 2001
From: Collin Smith <collinsmith70@gmail.com>
Date: Thu, 2 Jul 2020 20:48:05 -0700
Subject: [PATCH] Refactored code so that processing log message will include
 resolved client id

---
 .../src/com/riiablo/server/d2gs_netty/Server.java      | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/server/netty/src/com/riiablo/server/d2gs_netty/Server.java b/server/netty/src/com/riiablo/server/d2gs_netty/Server.java
index 1373e649..33a814c4 100644
--- a/server/netty/src/com/riiablo/server/d2gs_netty/Server.java
+++ b/server/netty/src/com/riiablo/server/d2gs_netty/Server.java
@@ -237,13 +237,13 @@ public class Server implements MessageProcessor {
     int numCached = inPackets.drainTo(inCache);
     if (DEBUG_RECEIVED_CACHE && numCached > 0) Gdx.app.debug(TAG, "Processing " + numCached + " packets...");
     for (InboundPacket<D2GS> packet : inCache) {
+      packet.setId(cdata.get(packet.sender(), InboundPacket.INVALID_CLIENT));
+      if (packet.id() == InboundPacket.INVALID_CLIENT && packet.dataType() != D2GSData.Connection) {
+        Gdx.app.error(TAG, "  " + packet + " from invalid client and not a connection request");
+        continue;
+      }
       if (DEBUG_RECEIVED_PACKETS && !ignoredPackets.get(packet.dataType())) Gdx.app.debug(TAG, "Processing " + packet);
       try {
-        packet.setId(cdata.get(packet.sender(), InboundPacket.INVALID_CLIENT));
-        if (packet.id() == InboundPacket.INVALID_CLIENT && packet.dataType() != D2GSData.Connection) {
-          Gdx.app.error(TAG, "  " + packet + " from invalid client and not a connection request");
-          continue;
-        }
         processPacket(packet);
       } finally {
         ReferenceCountUtil.release(packet);