From 54123ff9101933e22cde70fdec884ec8faf8ac87 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期四, 08 八月 2019 19:05:01 +0800
Subject: [PATCH] Merge branch 'master' of http://mobile.173on.com:10010/r/SnxxServerCode

---
 ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFB.py |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFB.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFB.py
index a3defea..a316f70 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFB.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFB.py
@@ -348,8 +348,9 @@
                 break
     
     key = (mapID, copyMapID)
-    copyMapObj = PyGameData.g_crossDynamicLineCopyMapInfo.pop(key, {})
-    
+    copyMapObj = PyGameData.g_crossDynamicLineCopyMapInfo.pop(key, None)
+    if not copyMapObj:
+        return
     #GameWorld.DebugLog("    PyGameData.g_crossDynamicLineInfo=%s" % PyGameData.g_crossDynamicLineInfo)
     #GameWorld.DebugLog("    PyGameData.g_crossDynamicLineCopyMapInfo=%s" % PyGameData.g_crossDynamicLineCopyMapInfo)
     

--
Gitblit v1.8.0