From 7961a4069020bcd74536a58a188bf533d46d2f4e Mon Sep 17 00:00:00 2001 From: jiahuiwen Date: Wed, 17 Nov 2021 17:24:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9D=E7=89=A9=E5=88=86=E8=A7=A3bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ljsd/jieling/logic/item/ItemLogic.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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 e66660e14..7c9816047 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 @@ -336,8 +336,11 @@ public class ItemLogic { throw new ErrorCodeException(ErrorCode.ITEM_DECOMPOSE_NO_EQUIP); } PropertyItem propertyItem = equipMap.get(jewelId); - if (!StringUtil.isEmpty(propertyItem.getHeroId())&&user.getHeroManager().getHero(propertyItem.getHeroId())!=null) { - throw new ErrorCodeException(ErrorCode.ITEM_DECOMPOSE_SOULE_CANT); + if (!StringUtil.isEmpty(propertyItem.getHeroId())) { + Hero hero = user.getHeroManager().getHero(propertyItem.getHeroId()); + if (hero != null && hero.getJewelInfo().contains(jewelId)) { + throw new ErrorCodeException(ErrorCode.ITEM_DECOMPOSE_SOULE_CANT); + } } Jewel jewel = (Jewel) propertyItem; SJewelConfig config = STableManager.getConfig(SJewelConfig.class).get(propertyItem.getEquipId());