fixed crashbug

AssassinTee · Jan 30, 2019 · 0837db8 · 0837db8
1 parent 6e7a7b9
commit 0837db8
Showing 1 changed file with 14 additions and 9 deletions.
diff --git a/src/game/server/wave.cpp b/src/game/server/wave.cpp
@@ -30,19 +30,24 @@ std::vector<int> CWave::GetZombNum(int wave)
     std::string wave_str= std::to_string(wave);
     json waves = m_Json.at("Waves");
     //GameServer()->Console()->Print(IConsole::OUTPUT_LEVEL_DEBUG, "debug", aBuf);
-    json curwave = waves.at(wave_str);
-    if(true)
+
+    json j = waves[wave_str];
+    if(!j.is_object())
+    {
+        return GetEndlessWave();
+    }
+    //if(j.is_object()){
+    std::vector<int> result;
+    for(int i = 0; i < 13; ++i)
     {
-        json j = curwave;//*it;
-        std::vector<int> result;
-        for(int i = 0; i < 13; ++i)
-        {
-            result.push_back(j.value(m_JsonZombieNames[i], 0));
-        }
-        return result;
+        result.push_back(j.value(m_JsonZombieNames[i], 0));
     }
+    return result;
+    /*}
     else
+    {
         return GetEndlessWave();
+    }*/
 }
 
 std::vector<int> CWave::GetEndlessWave()