From f72b071efd35b281030ba2c4b2820e4f9d83c58c Mon Sep 17 00:00:00 2001 From: xuexinpeng Date: Wed, 27 Oct 2021 19:17:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A4=E7=A9=BA=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/logic/activity/ActivityLogic.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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 d56235316..19fa3f25a 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 @@ -779,13 +779,16 @@ public class ActivityLogic implements IEventHandler{ Map activityMissionMap = activityManager.getActivityMissionMap(); for (Map.Entry item : activityMissionMap.entrySet()) { ActivityMission activityMission = item.getValue(); - if (activityMission.getActivityState() != ActivityType.OPEN_STATE) { + //7201活动弃用 + if(activityMission == null){ continue; } - //7201活动弃用 if(item.getKey() == 7201){ continue; } + if (activityMission.getActivityState() != ActivityType.OPEN_STATE) { + continue; + } AbstractActivity activityType = ActivityTypeEnum.getActicityType(item.getKey()); if (activityType != null){ activityType.checkActivityMissionFinishAndTake(user.getId(),item.getKey(), activityMission);