From c55c0b327df7f843737f3c58023577d87dd350d2 Mon Sep 17 00:00:00 2001
From: Tahir Akhlaq <xdemolish@hotmail.com>
Date: Sat, 8 Jul 2017 04:52:30 +0100
Subject: [PATCH] forgot to fix this on conflict resolving

---
 FFXIVClassic Map Server/actors/Actor.cs        | 3 ++-
 FFXIVClassic Map Server/dataobjects/Session.cs | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/FFXIVClassic Map Server/actors/Actor.cs b/FFXIVClassic Map Server/actors/Actor.cs
index 1f171348..fbc9dbf2 100644
--- a/FFXIVClassic Map Server/actors/Actor.cs	
+++ b/FFXIVClassic Map Server/actors/Actor.cs	
@@ -180,7 +180,8 @@ namespace FFXIVClassic_Map_Server.Actors
                 lastMoveUpdate = DateTime.Now;
                 return MoveActorToPositionPacket.BuildPacket(actorId, positionX, positionY, positionZ, rotation, moveState);
             }
-            return null;        }
+            return null;
+        }
 
         public SubPacket CreateStatePacket()
         {
diff --git a/FFXIVClassic Map Server/dataobjects/Session.cs b/FFXIVClassic Map Server/dataobjects/Session.cs
index 902b0b61..027223b6 100644
--- a/FFXIVClassic Map Server/dataobjects/Session.cs	
+++ b/FFXIVClassic Map Server/dataobjects/Session.cs	
@@ -122,7 +122,9 @@ namespace FFXIVClassic_Map_Server.dataobjects
                     if (actor is Character && ((Character)actor).isStatic)
                         continue;
 
-                    QueuePacket(actor.CreatePositionUpdatePacket());
+                    var packet = actor.CreatePositionUpdatePacket();
+                    if (packet != null)
+                        QueuePacket(packet);
                 }
                 else
                 {