diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/EndExpeditionBattleRequest.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/EndExpeditionBattleRequest.java index 49cbe3bba..6ac11347f 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/EndExpeditionBattleRequest.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/EndExpeditionBattleRequest.java @@ -1,6 +1,7 @@ package com.ljsd.jieling.handler.Expedition; import com.ljsd.fight.CheckFight; +import com.ljsd.fight.DefFightSnapData; import com.ljsd.jieling.config.clazzStaticCfg.CommonStaticConfig; import com.ljsd.jieling.db.redis.RedisKey; import com.ljsd.jieling.db.redis.RedisUtil; @@ -15,7 +16,6 @@ import com.ljsd.jieling.logic.activity.event.Poster; import com.ljsd.jieling.logic.dao.*; import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.logic.expedition.ExpeditionLogic; -import com.ljsd.fight.DefFightSnapData; import com.ljsd.jieling.logic.fight.FightUtil; import com.ljsd.jieling.logic.fight.GameFightType; import com.ljsd.jieling.logic.fight.result.FightResult; @@ -23,17 +23,19 @@ import com.ljsd.jieling.logic.hero.HeroAttributeEnum; import com.ljsd.jieling.logic.hero.HeroLogic; import com.ljsd.jieling.logic.mission.GameEvent; import com.ljsd.jieling.network.session.ISession; -import rpc.protocols.CommonProto; -import rpc.protocols.Expedition; -import rpc.protocols.MessageTypeProto; import com.ljsd.jieling.util.CBean2Proto; import com.ljsd.jieling.util.FightDataUtil; import com.ljsd.jieling.util.ItemUtil; import com.ljsd.jieling.util.MessageUtil; -import config.*; +import config.SExpeditionFloorConfig; +import config.SExpeditionNodeConfig; +import config.SExpeditionSetting; +import config.SMonsterConfig; import manager.STableManager; import org.luaj.vm2.LuaValue; -import util.StringUtil; +import rpc.protocols.CommonProto; +import rpc.protocols.Expedition; +import rpc.protocols.MessageTypeProto; import java.util.*; import java.util.stream.Collectors; 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 e58cab84a..2399618b2 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java @@ -1381,6 +1381,9 @@ public class CBean2Proto { Map itemMap = user.getEquipManager().getEquipMap(); for (String id : hero.getJewelInfo()) { Jewel jewel = (Jewel) itemMap.get(id); + if (jewel == null){ + continue; + } result.put(id,jewel); } return result;