From 6021025dc6f4398480146814724bd4794a867a16 Mon Sep 17 00:00:00 2001 From: xuexinpeng Date: Wed, 27 Oct 2021 19:39:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A4=E7=A9=BA=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/logic/activity/ActivityLogic.java | 3 +++ .../main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java | 3 +++ 2 files changed, 6 insertions(+) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java index 19fa3f25a..d10adee29 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java @@ -778,6 +778,9 @@ public class ActivityLogic implements IEventHandler{ ActivityManager activityManager = user.getActivityManager(); Map activityMissionMap = activityManager.getActivityMissionMap(); for (Map.Entry item : activityMissionMap.entrySet()) { + if(item == null || item.getValue() == null){ + continue; + } ActivityMission activityMission = item.getValue(); //7201活动弃用 if(activityMission == null){ diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java index fb547bdbf..0948a7c11 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java @@ -187,6 +187,9 @@ public class MissionLoigc { Map activityMissionMap = user.getActivityManager().getActivityMissionMap(); int treasureActivityId = 0; for(Integer activityId : activityMissionMap.keySet()){ + if(activityId == null){ + continue; + } if(!SGlobalActivity.getsGlobalActivityMap().containsKey(activityId)){ continue; }