From 7c0e200d18ee4fee88423c1f8f52b89de9f57e58 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Thu, 18 Jun 2020 17:04:00 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E5=A4=87=E4=BB=BB=E5=8A=A1=E8=8E=B7?= =?UTF-8?q?=E5=BE=97=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ljsd/jieling/logic/dao/EquipManager.java | 6 ++++-- .../jieling/logic/mission/data/GetEquipDataManager.java | 3 --- 2 files changed, 4 insertions(+), 5 deletions(-) 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 d74b30afd..bc2deaba2 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 @@ -33,8 +33,10 @@ public class EquipManager extends MongoBase { updateString("equipMap." + equip.getId(), equip); equipMap.put(equip.getId(),equip); // addEquipHandBook(equip.getEquipId()); - user.getUserMissionManager().onGameEvent(user, GameEvent.GET_EQUIP,equip.getEquipId()); - Poster.getPoster().dispatchEvent(new EquipEvent(user.getId(),equip.getEquipId())); + if(equip instanceof Equip){ + user.getUserMissionManager().onGameEvent(user, GameEvent.GET_EQUIP,equip.getEquipId()); + Poster.getPoster().dispatchEvent(new EquipEvent(user.getId(),equip.getEquipId())); + } } public void remove(String equipId){ diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/GetEquipDataManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/GetEquipDataManager.java index 72daa62b7..3a72fdaea 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/GetEquipDataManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/GetEquipDataManager.java @@ -13,9 +13,6 @@ public class GetEquipDataManager implements BaseDataManager{ int equipTid = (int)parm[0]; if(missionType == MissionType.USER_GET_EQUIP_QUALITY){ SEquipConfig sEquipConfig = STableManager.getConfig(SEquipConfig.class).get(equipTid); - if(sEquipConfig==null){ - return null; - } data.updateEquipQuality(STableManager.getConfig(SEquipConfig.class).get(equipTid).getQuality()); result = new CumulationData.Result(missionType); }