From 310476ac177ecaa2ee66c2207e2855a2215683ab Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期三, 16 一月 2019 18:09:57 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

---
 Core/NetworkPackage/GameNetSystem.cs |   24 ++++++++++++++++++------
 1 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/Core/NetworkPackage/GameNetSystem.cs b/Core/NetworkPackage/GameNetSystem.cs
index 5c212a4..9d48632 100644
--- a/Core/NetworkPackage/GameNetSystem.cs
+++ b/Core/NetworkPackage/GameNetSystem.cs
@@ -355,15 +355,27 @@
 
     void OnUpdate()
     {
-        while (mainProtocolQueue.Count > 0)
+        lock (this)
         {
-            PackageRegedit.Distribute(mainProtocolQueue.Dequeue());
+            while (mainProtocolQueue.Count > 0)
+            {
+                var package = mainProtocolQueue.Dequeue();
+                if (package != null)
+                {
+                    PackageRegedit.Distribute(package);
+                }
+            }
+
+            while (crossSeverProtocolQueue.Count > 0)
+            {
+                var package = crossSeverProtocolQueue.Dequeue();
+                if (package!=null)
+                {
+                    PackageRegedit.Distribute(package);
+                }
+            }
         }
 
-        while (crossSeverProtocolQueue.Count > 0)
-        {
-            PackageRegedit.Distribute(crossSeverProtocolQueue.Dequeue());
-        }
     }
 
     public enum NetState

--
Gitblit v1.8.0