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 1d2696f2b..1ffee5a8b 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 @@ -798,6 +798,7 @@ public class GuildLogic { case 4: title = SErrorCodeEerverConfig.getI18NMessage("family_relieved_leader_title"); content = SErrorCodeEerverConfig.getI18NMessage("family_relieved_leader_txt"); + position = 3; break; default: break; 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 3d29f8808..3ea6dca53 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 @@ -1168,20 +1168,22 @@ public class HeroLogic { if(!StringUtil.isEmpty(especialEquip)){ Map especialEquipMap = user.getEquipManager().getEspecialEquipMap(); - int equipTempId = especialEquipMap.get(especialEquip).getEquipId(); - int tempStar = especialEquipMap.get(especialEquip).getStar(); - Map> equipTalismanaMap = SEquipTalismana.equipTalismanaStarMap; - - SEquipTalismana equipTali = equipTalismanaMap.get(equipTempId).get(tempStar); - combinedAttribute(equipTali.getProperty(),heroAllAttribute); - //法宝职业额外加成 - SCHero tempHero = SCHero.getsCHero().get(hero.getTemplateId()); - int[][] specialProperty = equipTali.getSpecialProperty(); - for(int i = 0 ; i < specialProperty.length;i++){ - if(tempHero.getProfession()==specialProperty[i][0]){ - int [][] property = new int[1][]; - property[0] = new int[]{specialProperty[i][1],specialProperty[i][2]}; - combinedAttribute(property, heroAllAttribute); + EspecialEquip myEspecial = especialEquipMap.get(especialEquip); + if(myEspecial!=null){ + int equipTempId = myEspecial.getEquipId(); + int tempStar = myEspecial.getStar(); + Map> equipTalismanaMap = SEquipTalismana.equipTalismanaStarMap; + SEquipTalismana equipTali = equipTalismanaMap.get(equipTempId).get(tempStar); + combinedAttribute(equipTali.getProperty(),heroAllAttribute); + //法宝职业额外加成 + SCHero tempHero = SCHero.getsCHero().get(hero.getTemplateId()); + int[][] specialProperty = equipTali.getSpecialProperty(); + for(int i = 0 ; i < specialProperty.length;i++){ + if(tempHero.getProfession()==specialProperty[i][0]){ + int [][] property = new int[1][]; + property[0] = new int[]{specialProperty[i][1],specialProperty[i][2]}; + combinedAttribute(property, heroAllAttribute); + } } } }