From 8245e38da59be26504cbbdd21c2cad0b8fd459f2 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 23 Nov 2022 09:52:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=BE=A9=E5=AE=95=E6=A9=9Fbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/gameserver/incubator.cc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/server/gameserver/incubator.cc b/server/gameserver/incubator.cc index ead84fff..50aa96fd 100644 --- a/server/gameserver/incubator.cc +++ b/server/gameserver/incubator.cc @@ -404,10 +404,12 @@ void Incubator::NextWave() int acc_time = 0; { xtimer_list* timer = wave_timers_[room->pve_data.GetWave()]; - int remain_time = room->xtimer.GetRemainTime(timer); - room->xtimer.ModifyTimer - (timer, room->pve_mode_meta->pb->wave_prepare_time() * SERVER_FRAME_RATE); - acc_time = remain_time; + if (timer) { + int remain_time = room->xtimer.GetRemainTime(timer); + room->xtimer.ModifyTimer + (timer, room->pve_mode_meta->pb->wave_prepare_time() * SERVER_FRAME_RATE); + acc_time = remain_time; + } } acc_time -= room->pve_mode_meta->pb->wave_prepare_time() * SERVER_FRAME_RATE; for (int i = room->pve_data.GetWave() + 1; i < wave_timers_.size(); ++i) {