diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildFightLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildFightLogic.java index 949f64f7e..b674b976e 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildFightLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildFightLogic.java @@ -258,9 +258,9 @@ public class GuildFightLogic { //匹配处理 GuildInfo guildInfo = GuilidManager.guildInfoMap.get(gid); //todo 人数限制 -// if(guildInfo.getDefendInfo().size()> entry:guildInfo.getMembers().entrySet()){ for(Integer uid:entry.getValue()){ diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java index 08d47f557..a2bec6d72 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java @@ -439,6 +439,7 @@ public class CBean2Proto { .setOutTime(outTime) .setFrame(user.getPlayerInfoManager().getHeadFrame()) .setTime(applyTime) + .setHead(user.getPlayerInfoManager().getHead()) .build(); }