diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java index a0c7045c3..463ac5336 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java @@ -643,15 +643,6 @@ public class PlayerLogic { //获取跨服玩家信息 public PlayerInfoProto.GetPlayerOneTeamInfoResponse getCrossOneTeamInfo( int id,int teamId) throws Exception { -// if(id==0){ -// throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE); -// } -// SArenaRobotConfig sArenaRobotConfig = SArenaRobotConfig.getsArenaRobotConfigById(id); - CommonProto.TeamOneInfo.Builder oneInfo=null; -// if(sArenaRobotConfig!=null){ -// oneInfo=getRobotTeamInfo(sArenaRobotConfig); -// }else{ - oneInfo = getUserTeamOneInfo(id, teamId); ArenaOfUser query = CrossServiceLogic.getInstance().query(id); if(query==null){ throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE); @@ -669,7 +660,7 @@ public class PlayerLogic { teamOneTeamInfo.addTeam(CBean2Proto.getCrossSimpleHero(hero,heroInfo.getPosition())); } builder.setTeam(teamOneTeamInfo.build()); - PlayerInfoProto.GetPlayerOneTeamInfoResponse.Builder playerTeamInfo = PlayerInfoProto.GetPlayerOneTeamInfoResponse.newBuilder().setTeamInfo(oneInfo); + PlayerInfoProto.GetPlayerOneTeamInfoResponse.Builder playerTeamInfo = PlayerInfoProto.GetPlayerOneTeamInfoResponse.newBuilder().setTeamInfo(builder.build()); return playerTeamInfo.build(); }