Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Correctly set visibility of local player's attached objects #8342

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/client/content_cao.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1531,8 +1531,11 @@ void GenericCAO::processMessage(const std::string &data)
setAttachment(parent_id, bone, position, rotation);

// localplayer itself can't be attached to localplayer
if (!m_is_local_player)
m_is_visible = !m_attached_to_local;
if (!m_is_local_player) {
// Objects attached to the local player should be hidden in first person
m_is_visible = (!m_attached_to_local) ||
(m_client->getCamera()->getCameraMode() != CAMERA_MODE_FIRST);
}
} else if (cmd == GENERIC_CMD_PUNCHED) {
u16 result_hp = readU16(is);

Expand Down