Index: src/org/mmocore/network/MMOConnection.java
===================================================================
--- src/org/mmocore/network/MMOConnection.java  (revision 3706)
+++ src/org/mmocore/network/MMOConnection.java  (working copy)
@@ -86,7 +86,7 @@

     public final void sendPacket(final SendablePacket<T> sp)
     {
-        sp._client = _client;
+        //sp._client = _client;

         synchronized (getSendQueue())
         {
Index: src/org/mmocore/network/SelectorThread.java
===================================================================
--- src/org/mmocore/network/SelectorThread.java (revision 3706)
+++ src/org/mmocore/network/SelectorThread.java (working copy)
@@ -564,13 +564,17 @@
         final int headerPos = WRITE_BUFFER.position();
         final int dataPos = headerPos + HEADER_SIZE;
         WRITE_BUFFER.position(dataPos);
-
+
+        // set client
+        sp._client = client;
         // set the write buffer
         sp._buf = WRITE_BUFFER;
         // write content to buffer
         sp.write();
         // delete the write buffer
         sp._buf = null;
+        // release client
+        sp._client = null;

         // size (inclusive header)
         int dataSize = WRITE_BUFFER.position() - dataPos;