server/game2001
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复组队问题

Browse Source
This commit is contained in:
aozhiwei 2019-05-06 11:26:24 +08:00
parent 3ef654d04b
commit ae8cb0487d
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server/gameserver/framemaker.cc
View File

@ -8,13 +8,6 @@ cs::SMUpdate* FrameMaker::MakeUpdateMsg(const Human* hum)
{
cs::SMUpdate* msg = new cs::SMUpdate;
{
if (hum->team_members) {
for (auto& itr : *hum->team_members) {
if (itr != hum) {
itr->FillMFTeamData(msg->add_team_data());
}
}
}
Room* room = hum->room;
if (room->gas_data.gas_mode == GasJump) {
cs::MFPlane* p = msg->mutable_plane();

8
server/gameserver/human.cc
View File

@ -1215,6 +1215,14 @@ void Human::SendUpdateMsg()
bool refreshed_view = false;
std::set<Entity*> view_objects;
for (Human* observer : observers_) {
msg->clear_team_data();
if (observer->team_members) {
for (auto& itr : *observer->team_members) {
if (itr != observer) {
itr->FillMFTeamData(msg->add_team_data());
}
}
}
if (observer != this && !observer->follow_synced_active_player) {
msg->set_active_player_id(entity_uniid);
FillMFActivePlayerData(msg->mutable_active_player_data());