diff --git a/serverlogic/src/main/java/com/ljsd/jieling/db/mongo/MongoUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/db/mongo/MongoUtil.java index ffa935dc2..bd8e8d655 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/db/mongo/MongoUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/db/mongo/MongoUtil.java @@ -256,7 +256,7 @@ public class MongoUtil { } return mongoTemplate; } - // 如果不参与跨服,不可以获取其他服数据 + // 如果不参与跨服,不可以获取其他服mongoTemplate if (GlobleSystemLogic.crossGroup == 0) { return null; } @@ -264,10 +264,11 @@ public class MongoUtil { if (group == null || group <= 0){ return null; } - // 不是同一组也不可以获取数据 + // 不是同一组也不可以获取mongoTemplate if (GlobleSystemLogic.crossGroup != group) { return null; } + // 不合服不可以获取mongoTemplate if(!AreaManager.getInstance().checkServerIdAllowPermit(serverId)){ return null; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildChallengeLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildChallengeLogic.java index 872c1000c..07448b837 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildChallengeLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildChallengeLogic.java @@ -344,7 +344,7 @@ public class GuildChallengeLogic { Family.GuildChallengeIndication.Builder otherIndication = Family.GuildChallengeIndication.newBuilder() .setBlood(remainHp) .setCurBoss(guildInfo.getCurrBossId()); - if(kill==1&&!UserManager.getUser(sendUid).getGuildMyInfo().getRefreshedBoss().contains(bossId)&&guildInfo.getBossHpRemain()!=-1){ + if(kill==1&&!PlayerLogic.getInstance().getUserByRpc(sendUid).getGuildMyInfo().getRefreshedBoss().contains(bossId)&&guildInfo.getBossHpRemain()!=-1){ otherIndication.setIsRefresh(1);//需要前端刷新次数 } if(isession!=null){ diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java index 42a77949a..3e8cbe86a 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java @@ -773,9 +773,6 @@ public class GuildLogic { } guildInfo.removeMember(targetType,targetUid); guildInfo.addMembers(position,targetUid); -// PlayerInfoCache cache = RedisUtil.getInstence().getMapEntry(RedisKey.PLAYER_INFO_CACHE, "", String.valueOf(uid), PlayerInfoCache.class); -// cache.setGuildPosition(position); -// RedisUtil.getInstence().putMapEntry(RedisKey.PLAYER_INFO_CACHE,"",String.valueOf(uid),cache); PlayerLogic.getInstance().playerInfoUpdate(PlayerLogic.getInstance().getUserByRpc(targetUid)); sendPositionChange(targetUid,position); @@ -1468,6 +1465,9 @@ public class GuildLogic { if(!alreadyList.isEmpty()) { for(Map.Entry already:alreadyList.entrySet()){ User guildUser = PlayerLogic.getInstance().getUserByRpc(already.getValue().getUid()); + if (guildUser == null) { + continue; + } PlayerManager playerInfoManager = guildUser.getPlayerInfoManager(); CommonProto.RedOneDetail.Builder detail= CommonProto.RedOneDetail.newBuilder() .setUid(already.getValue().getUid())