From bbc555db7c028d7eeb9a4d92bb2ddab24562f729 Mon Sep 17 00:00:00 2001 From: jiahuiwen Date: Mon, 13 Dec 2021 14:04:12 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=88=A0=E6=B4=BB=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/logic/activity/ActivityLogic.java | 5 +++++ 1 file changed, 5 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 f5b793169..962c594b0 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 @@ -369,6 +369,11 @@ public class ActivityLogic implements IEventHandler{ //初始化活动 绝对时间和相对开服时间 for (Integer openActivityId : openActivityIds) { SGlobalActivity sGlobalActivity = sGlobalActivityMap.get(openActivityId); + if (sGlobalActivity == null) { + LOGGER.info("checkActivityOfUser uid={} remove activity={}", user.getId(), openActivityId); + continue; + } + } int[] ifOpen = sGlobalActivity.getIfOpen(); //创角 if(ifOpen!=null && ifOpen.length>0 && ifOpen[0]==1){ From 586945be2c21b2e59d4f00d2d44b74205375fac0 Mon Sep 17 00:00:00 2001 From: jiahuiwen Date: Mon, 13 Dec 2021 14:05:11 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java | 1 - 1 file changed, 1 deletion(-) 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 198fa5806..4a7c82ae9 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 @@ -373,7 +373,6 @@ public class ActivityLogic implements IEventHandler{ LOGGER.info("checkActivityOfUser uid={} remove activity={}", user.getId(), openActivityId); continue; } - } int[] ifOpen = sGlobalActivity.getIfOpen(); //创角 if(ifOpen!=null && ifOpen.length>0 && ifOpen[0]==1){ From 08ca89a90f424127ff3e03a2a9449e2ec1bfa1b0 Mon Sep 17 00:00:00 2001 From: jiahuiwen Date: Mon, 13 Dec 2021 14:44:08 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=BC=80=E5=95=86=E5=BA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/logic/activity/ActivityLogic.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 4a7c82ae9..6558ff94f 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 @@ -408,7 +408,7 @@ public class ActivityLogic implements IEventHandler{ } // 登录检测已开启的活动,商店是否开启 int[] shopId = sGlobalActivity.getShopId(); - if (shopId != null && shopId.length > 0) { + if (shopId != null && shopId.length > 0 && shopId[0] != 0) { boolean b = user.getStoreManager().getStoreInfoMap().containsKey(shopId[0]); if (!b) { LOGGER.info("checkActivityOfUser uid={} activityId={} reopen shopId={}", user.getId(), openActivityId, shopId[0]);