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

1

Browse Source
This commit is contained in:
aozhiwei 2023-05-17 15:17:54 +08:00
parent 0a93092c23
commit ad9b5de45c
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
server/gameserver/player.cc
View File

@ -164,6 +164,14 @@ void Player::InternalUpdate(int delta_time)
moving = true; moving = true;
moved_frames = 0; moved_frames = 0;
} }
if (room->GetGasData().GetGasMode() == GasInactive &&
room->IsSandTableRoom()
) {
if (sand_table_target_pos) {
} else {
moving = false;
}
}
if (moving) { if (moving) {
UpdateMoving(); UpdateMoving();
} }
@ -1031,6 +1039,11 @@ void Player::_CMMove(f8::MsgHdr& hdr, const cs::CMMove& msg)
sand_table_target_pos = std::make_shared<glm::vec3>(); sand_table_target_pos = std::make_shared<glm::vec3>();
} }
TypeConvert::FromPb(*sand_table_target_pos, &msg.sand_table_target_pos()); TypeConvert::FromPb(*sand_table_target_pos, &msg.sand_table_target_pos());
if (GlmHelper::IsEqual2D(*sand_table_target_pos, GetPos().ToGlmVec3())) {
sand_table_target_pos = nullptr;
} else {
glm::vec3 dir = *sand_table_target_pos - GetPos().ToGlmVec3();
}
} else { } else {
sand_table_target_pos = nullptr; sand_table_target_pos = nullptr;
} }