diff --git a/conf/hotfix.json b/conf/hotfix.json index 60a170388..3e0cf5670 100644 --- a/conf/hotfix.json +++ b/conf/hotfix.json @@ -1,5 +1,5 @@ { - "version":"7", + "version":"8", "classes": [ {"name":"MissionEventDistributor.class","fullName":"com.ljsd.jieling.logic.mission.event.MissionEventDistributor"}, {"name":"EveryDayDiscountType.class","fullName":"com.ljsd.jieling.logic.mission.main.EveryDayDiscountType"} diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/MissionEventDistributor.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/MissionEventDistributor.java index a3718c334..6070b36c4 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/MissionEventDistributor.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/MissionEventDistributor.java @@ -241,7 +241,7 @@ public class MissionEventDistributor { } public static final ThreadLocal>> threadMissionChangeList = new ThreadLocal<>(); - private static final ThreadLocal threadUseFlag = new ThreadLocal(); + private static final ThreadLocal threadUseFlag = new ThreadLocal<>(); public static List getMissionStateChangeInfo(GameMisionType gameMisionType){ Map> missionTypeEnumListMap = threadMissionChangeList.get(); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/main/EveryDayDiscountType.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/main/EveryDayDiscountType.java index 88d0ae30c..09de1a463 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/main/EveryDayDiscountType.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/main/EveryDayDiscountType.java @@ -9,6 +9,7 @@ import com.ljsd.jieling.logic.mission.data.AbstractDataManager; import com.ljsd.jieling.logic.mission.data.DataManagerDistributor; import config.SEveryDayGiftTask; +import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.Map; @@ -33,6 +34,9 @@ public class EveryDayDiscountType extends AbstractMissionType { if (taskMap == null){ return; } + if (missionStateChangeInfos == null){ + missionStateChangeInfos = new ArrayList<>(); + } for (SEveryDayGiftTask task : taskMap.values()) { // 任务子id int id = task.getId();