From 11711a219de57ba91c17c639b7a324a3e4d8a07f Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Sun, 4 Feb 2024 10:56:32 +0800 Subject: [PATCH] 1 --- server/gameserver/room.cc | 6 +++--- server/gameserver/team.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc index 1c8119cf..2dda6fbd 100644 --- a/server/gameserver/room.cc +++ b/server/gameserver/room.cc @@ -2014,10 +2014,10 @@ void Room::FillTeam() std::vector> free_team_list; TraverseTeams ( - [] (Team* ele_team) -> bool + [&free_team_list] (Team* ele_team) -> bool { if (ele_team->IsFreeTeam()) { - free_team_list.push_back(ele_team); + free_team_list.push_back(ele_team->shared_from_this()); } return true; }); @@ -2055,7 +2055,7 @@ void Room::FillTeam() { ele_team->GenBattleUuid(); if (ele_team->HasPlayer()) { - batch_sync_->AddTeam(ele_team.get()); + batch_sync_->AddTeam(ele_team); } return true; }); diff --git a/server/gameserver/team.h b/server/gameserver/team.h index 62f8a8e7..feb9124c 100644 --- a/server/gameserver/team.h +++ b/server/gameserver/team.h @@ -12,7 +12,7 @@ namespace a8 class Room; class Human; -class Team +class Team : public std::enable_shared_from_this { public: Room* room = nullptr;