浏览代码

Merge pull request #3750 from IvanSavenko/fix_quest_crash

Fix crash on accessing nullptr quest
Ivan Savenko 1 年之前
父节点
当前提交
e1581087c3
共有 1 个文件被更改,包括 3 次插入7 次删除
  1. 3 7
      lib/networkPacks/NetPacksLib.cpp

+ 3 - 7
lib/networkPacks/NetPacksLib.cpp

@@ -1199,13 +1199,9 @@ void RemoveObject::applyGs(CGameState *gs)
 		gs->map->quests[quest->quest->qid] = nullptr;
 		for (auto &player : gs->players)
 		{
-			for (auto &q : player.second.quests)
-			{
-				if (q.obj == obj)
-				{
-					q.obj = nullptr;
-				}
-			}
+			vstd::erase_if(player.second.quests, [obj](const QuestInfo & q){
+				return q.obj == obj;
+			});
 		}
 	}