From 3d7d4a003455176e07b517068608a999796fdf6e Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 27 十一月 2018 22:25:02 +0800
Subject: [PATCH] 4762 【后端】修复两个非好友玩家都没有仙盟时被视为同仙盟的bug；
---
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFBHelpBattle.py | 2 +-
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBHelpBattle.py | 4 ++--
2 files changed, 3 insertions(+), 3 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
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBHelpBattle.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBHelpBattle.py
index 64f8809..2cda424 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBHelpBattle.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBHelpBattle.py
@@ -536,7 +536,7 @@
break
if checkRelation == 2:
for memPlayerID, memFamilyID in memFamilyIDDict.items():
- if playerID != memPlayerID and familyID == memFamilyID:
+ if playerID != memPlayerID and familyID and familyID == memFamilyID:
memRelation = checkRelation
relationPlayerID = memPlayerID
break
@@ -553,7 +553,7 @@
if [playerID, memPlayerID] in friendList:
memRelation = checkRelation
break
- if playerID != memPlayerID and familyID == memFamilyID:
+ if playerID != memPlayerID and familyID and familyID == memFamilyID:
memRelation = checkRelation
break
if not memRelation:
--
Gitblit v1.8.0