From 47e583801c89ba24233de12ddd4291945ef15827 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期三, 28 十一月 2018 15:46:58 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode

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

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFBHelpBattle.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFBHelpBattle.py
index 77afcd7..b86c71e 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFBHelpBattle.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFBHelpBattle.py
@@ -446,7 +446,7 @@
             if PlayerFriend.IsFriend(playerID, tagPlayerID):
                 return checkRelation
         if checkRelation == 2:
-            if curPlayer.GetFamilyID() == tagFamilyID:
+            if tagFamilyID and curPlayer.GetFamilyID() == tagFamilyID:
                 return checkRelation
     return 0
 

--
Gitblit v1.8.0