diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java index d962f7a06..84a5f051f 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java @@ -3100,8 +3100,13 @@ public class HeroLogic { if (!faxiangList.isEmpty()) { for (String id : faxiangList) { PropertyItem faxiang = equipManager.getEquip(id); + if(faxiang == null){ + continue; + } SFaxiangConfig config = SFaxiangConfig.faxiangMap.get(faxiang.getEquipId()); - + if(config == null){ + continue; + } // 潜能加成 int potentialType = config.getType() == 0 ? 7 : 8; int potentialBuff = getPotentialBuff(user, hero, potentialType); 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 a2a4d6437..eba34caeb 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 @@ -1055,7 +1055,9 @@ public class PlayerLogic { // 法相 for(String key : hero.getFaxiangList()){ PropertyItem faxiang = equipManager.getEquip(key); - builder.addEquip(CBean2Proto.getPropertyEquipProto(faxiang)); + if(faxiang != null){ + builder.addEquip(CBean2Proto.getPropertyEquipProto(faxiang)); + } } // 法宝 Baubles baubles = equipManager.getBaubles(hero.getBauBlesId());