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 5819c9631..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 @@ -551,6 +551,9 @@ public class ActivityLogic implements IEventHandler{ if (activityMission == null) { continue; } + if(activityId == 7201){ + continue; + } int activityStatus = activityMission.getActivityState(); if(activityStatus == -1){ continue; @@ -775,7 +778,17 @@ 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){ + continue; + } + if(item.getKey() == 7201){ + continue; + } if (activityMission.getActivityState() != ActivityType.OPEN_STATE) { continue; } 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 8375c6502..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,12 @@ 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; + } if(SGlobalActivity.getsGlobalActivityMap().get(activityId).getType() == activityType){ treasureActivityId = activityId; }