From 06e7ea59f431b9e4aa3f906ad95492a244779052 Mon Sep 17 00:00:00 2001
From: Filip Maj <filipmaj@gmail.com>
Date: Mon, 29 Aug 2016 09:03:48 -0400
Subject: [PATCH] Fixed NLog config for map server. Added some debug printouts
 while testing.

---
 FFXIVClassic Map Server/NLog.config                       | 7 ++++---
 FFXIVClassic Map Server/ZoneConnection.cs                 | 5 ++++-
 FFXIVClassic World Server/DataObjects/ClientConnection.cs | 4 +++-
 FFXIVClassic World Server/Server.cs                       | 1 +
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/FFXIVClassic Map Server/NLog.config b/FFXIVClassic Map Server/NLog.config
index a59613ac..ad616d50 100644
--- a/FFXIVClassic Map Server/NLog.config	
+++ b/FFXIVClassic Map Server/NLog.config	
@@ -38,13 +38,13 @@
     <target xsi:type="ColoredConsole" name="packets"
             layout="${message}">
       <highlight-row
-        condition="equals('${logger}', 'FFXIVClassic_Map_Server.packets.BasePacket') and equals('${event-context:item=color}', '6')"
+        condition="equals('${logger}', 'FFXIVClassic.Common.BasePacket') and equals('${event-context:item=color}', '6')"
         backgroundColor="DarkYellow" foregroundColor="NoChange" />
       <highlight-row
-        condition="equals('${logger}', 'FFXIVClassic_Map_Server.packets.SubPacket') and equals('${event-context:item=color}', '4')"
+        condition="equals('${logger}', 'FFXIVClassic.Common.SubPacket') and equals('${event-context:item=color}', '4')"
         backgroundColor="DarkRed" foregroundColor="NoChange" />
       <highlight-row
-        condition="equals('${logger}', 'FFXIVClassic_Map_Server.packets.SubPacket') and equals('${event-context:item=color}', '5')"
+        condition="equals('${logger}', 'FFXIVClassic.Common.SubPacket') and equals('${event-context:item=color}', '5')"
         backgroundColor="DarkMagenta" foregroundColor="NoChange" />
     </target>
   </targets>
@@ -55,6 +55,7 @@
     <logger name='FFXIVClassic_Map_Server.Program' minlevel='Trace' writeTo='console' />
     <logger name='FFXIVClassic_Map_Server.lua.*' minlevel='Trace' writeTo='console' />
     <logger name='FFXIVClassic_Map_Server.packets.*' minlevel='Debug' writeTo='packets' />
+    <logger name='FFXIVClassic.Common.*' minlevel='Debug' writeTo='packets' />
     <!--
     Write all events with minimal level of Debug (So Debug, Info, Warn, Error and Fatal, but not Trace)  to "f"
     <logger name="*" minlevel="Debug" writeTo="f" />
diff --git a/FFXIVClassic Map Server/ZoneConnection.cs b/FFXIVClassic Map Server/ZoneConnection.cs
index 4a1af12d..167714e5 100644
--- a/FFXIVClassic Map Server/ZoneConnection.cs	
+++ b/FFXIVClassic Map Server/ZoneConnection.cs	
@@ -4,6 +4,7 @@ using System.Net.Sockets;
 using FFXIVClassic.Common;
 using System.Collections.Concurrent;
 using System.Net;
+using System.Collections.Generic;
 
 namespace FFXIVClassic_Map_Server
 {
@@ -17,7 +18,9 @@ namespace FFXIVClassic_Map_Server
 
         public void QueuePacket(BasePacket packet)
         {
-            //SendPacketQueue.Add(packet);
+            List<SubPacket> subPackets = packet.GetSubpackets();
+            foreach (SubPacket s in subPackets)
+                SendPacketQueue.Add(s);
         }
 
         public void QueuePacket(SubPacket subpacket, bool isAuthed, bool isEncrypted)
diff --git a/FFXIVClassic World Server/DataObjects/ClientConnection.cs b/FFXIVClassic World Server/DataObjects/ClientConnection.cs
index 163c079e..78f5aec2 100644
--- a/FFXIVClassic World Server/DataObjects/ClientConnection.cs	
+++ b/FFXIVClassic World Server/DataObjects/ClientConnection.cs	
@@ -35,7 +35,9 @@ namespace FFXIVClassic_World_Server
 
             while (SendPacketQueue.Count > 0)
             {
-                BasePacket packet = SendPacketQueue.Take();                
+                BasePacket packet = SendPacketQueue.Take();
+
+                packet.DebugPrintPacket();
 
                 byte[] packetBytes = packet.GetPacketBytes();
 
diff --git a/FFXIVClassic World Server/Server.cs b/FFXIVClassic World Server/Server.cs
index bcd0b880..305bea44 100644
--- a/FFXIVClassic World Server/Server.cs	
+++ b/FFXIVClassic World Server/Server.cs	
@@ -136,6 +136,7 @@ namespace FFXIVClassic_World_Server
 
         public void OnReceiveSubPacketFromZone(ZoneServer zoneServer, SubPacket subpacket)
         {
+            subpacket.DebugPrintSubPacket();
             uint sessionId = subpacket.header.targetId;
 
             if (mZoneSessionList.ContainsKey(sessionId))