diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/GetAllHerosHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/GetAllHerosHandler.java index 39029d55a..12d22a921 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/GetAllHerosHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/GetAllHerosHandler.java @@ -58,6 +58,12 @@ public class GetAllHerosHandler extends BaseHandler{ } } } + //法宝容错处理 + String fabaoId = hero.getBauBlesId(); + if(user.getEquipManager().getBaubles(fabaoId) == null){ + //法宝已经被删除,删掉法宝信息 + hero.setBauBlesId(""); + } heroList.add(CBean2Proto.getHero(hero)); } boolean isSendFinish = false; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/EquipManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/EquipManager.java index 9af4dbfe4..a36c53535 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/EquipManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/EquipManager.java @@ -126,7 +126,13 @@ public class EquipManager extends MongoBase { } public Baubles getBaubles(String equipId) { + if(!getEquipMap().containsKey(equipId)){ + return null; + } PropertyItem item = getEquipMap().get(equipId); + if(item == null){ + return null; + } if (item instanceof Baubles){ return (Baubles) item; }