From 6b8b41ae2d4630d1f2a7a4e5f847ed0ee7b9160b Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Tue, 26 May 2020 15:10:24 +0800
Subject: [PATCH] 1

---
 server/gameserver/room.cc | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index cefd0f2..9991832 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -1836,12 +1836,6 @@ void Room::ShuaAndroidTimerFunc()
                                   MetaMgr::Instance()->level1room_shua_robot_max_num
                                   );
         }
-        if (shua_time <= 0) {
-            return;
-        }
-        if (shua_num <= 0) {
-            return;
-        }
         shua_android_timer = xtimer.AddDeadLineTimerAndAttach
             (SERVER_FRAME_RATE * shua_time,
              a8::XParams()
@@ -1858,7 +1852,9 @@ void Room::ShuaAndroidTimerFunc()
                  room->shua_android_timer = nullptr;
              }
              );
-        ProcShuaAndroid(shua_time, shua_num);
+        if (shua_time > 0 && shua_num > 0) {
+            ProcShuaAndroid(shua_time, shua_num);
+        }
     }
 }
 
@@ -1883,12 +1879,6 @@ void Room::DieAndroidTimerFunc()
                                   MetaMgr::Instance()->level1room_die_robot_max_num
                                   );
         }
-        if (die_time <= 0) {
-            return;
-        }
-        if (die_num <= 0) {
-            return;
-        }
         die_android_timer = xtimer.AddDeadLineTimerAndAttach
             (SERVER_FRAME_RATE * die_time,
              a8::XParams()
@@ -1905,7 +1895,9 @@ void Room::DieAndroidTimerFunc()
                  room->die_android_timer = nullptr;
              }
              );
-        ProcDieAndroid(die_time, die_num);
+        if (die_time > 0 && die_num > 0) {
+            ProcDieAndroid(die_time, die_num);
+        }
     }
 }