Merge branch 'master_prb_gn' into master_test_gn
commit
dc30ecffb7
|
@ -336,8 +336,11 @@ public class ItemLogic {
|
||||||
throw new ErrorCodeException(ErrorCode.ITEM_DECOMPOSE_NO_EQUIP);
|
throw new ErrorCodeException(ErrorCode.ITEM_DECOMPOSE_NO_EQUIP);
|
||||||
}
|
}
|
||||||
PropertyItem propertyItem = equipMap.get(jewelId);
|
PropertyItem propertyItem = equipMap.get(jewelId);
|
||||||
if (!StringUtil.isEmpty(propertyItem.getHeroId())&&user.getHeroManager().getHero(propertyItem.getHeroId())!=null) {
|
if (!StringUtil.isEmpty(propertyItem.getHeroId())) {
|
||||||
throw new ErrorCodeException(ErrorCode.ITEM_DECOMPOSE_SOULE_CANT);
|
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;
|
Jewel jewel = (Jewel) propertyItem;
|
||||||
SJewelConfig config = STableManager.getConfig(SJewelConfig.class).get(propertyItem.getEquipId());
|
SJewelConfig config = STableManager.getConfig(SJewelConfig.class).get(propertyItem.getEquipId());
|
||||||
|
|
Loading…
Reference in New Issue