Merge branch 'master_test_gn_zf' into master_test_gn
commit
f9115627b9
|
|
@ -204,10 +204,11 @@ public class HeroLogic{
|
|||
//宝器
|
||||
if(type==4){
|
||||
Map<String, PropertyItem> equipMap = user.getEquipManager().getEquipMap();
|
||||
Set<String> needRemove = new HashSet<>(equipMap.size());
|
||||
for(Map.Entry<String, PropertyItem> equipInfoEntry : equipMap.entrySet()){
|
||||
PropertyItem value = equipInfoEntry.getValue();
|
||||
if (value == null) {
|
||||
equipManager.remove(equipInfoEntry.getKey());
|
||||
needRemove.add(equipInfoEntry.getKey());
|
||||
LOGGER.info("getAllEquipInfo uid={} remove null jewel{}", uid, equipInfoEntry.getKey());
|
||||
continue;
|
||||
}
|
||||
|
|
@ -215,6 +216,11 @@ public class HeroLogic{
|
|||
equipList.add(CBean2Proto.getEquipProto(value));
|
||||
}
|
||||
}
|
||||
if (!needRemove.isEmpty()) {
|
||||
for (String id : needRemove) {
|
||||
equipManager.remove(id);
|
||||
}
|
||||
}
|
||||
}else {
|
||||
throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue