From 3c103fac3edb1715d5875e23955f91a59cf77fe1 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Thu, 10 Oct 2019 15:55:37 +0800 Subject: [PATCH] check --- .../main/java/com/ljsd/jieling/logic/item/ItemLogic.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java index 6ff26809b..2e554cfe7 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java @@ -445,6 +445,10 @@ public class ItemLogic { public void especialEquipUpStar(ISession session, String equipId, List materials) throws Exception { User user = UserManager.getUser(session.getUid()); EspecialEquip especialEquip = user.getEquipManager().getEspecialEquipMap().get(equipId); + if(especialEquip == null){ + MessageUtil.sendErrorResponse(session,0,MessageTypeProto.MessageType.UP_HERO_STAR_RESPONSE_VALUE,"not exists"); + return; + } SEquipTalismana sEquipTalismana = SEquipTalismana.equipTalismanaStarMap.get(especialEquip.getEquipId()).get(especialEquip.getStar()); Map equipTalismanaRankupMap = SEquipTalismanaRankup.equipTalismanaRankupMap; boolean success = true; @@ -458,6 +462,10 @@ public class ItemLogic { } SEquipTalismanaRankup sEquipTalismanaRankup = equipTalismanaRankupMap.get(sEquipTalismana.getRankupConsumeMaterial()[i][1]); for(String materEquip:material.getHeroIdsList()){ + if(equipId.equals(materEquip)){ + MessageUtil.sendErrorResponse(session,0,MessageTypeProto.MessageType.UP_HERO_STAR_RESPONSE_VALUE,"不能吞自己"); + return; + } EspecialEquip especialEquip1 = user.getEquipManager().getEspecialEquipMap().get(materEquip); //材料种类判断 if(sEquipTalismanaRankup.getIssame()==1){