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

Fix team chat messages not always being displayed #17381

Merged
merged 1 commit into from Dec 10, 2019
Merged

Conversation

@abcdefg30
Copy link
Member

abcdefg30 commented Nov 24, 2019

Reported by Eskimo/Arbiter on Discord. Regression from #15615.

Apparently OrderManager.LocalClient is not always null in replay connections, only sometimes, namely when no client with ID 0 is present in the game (because of this line in ReplayConnection.cs). And during testing nobody noticed that it is not always guaranteed to be the first client (but can be null), since we most likely always had a client with ID 0 present.
It's probably best to use one of the replays posted on Discord to verify this bugfix (the changes should be compatible with the latest release and don't cause desyncs).

We circumvent this now by not (bogusly) bailing when LocalClient is null, but instead always explicitly checking for null and ignoring LocalClient when we are in a replay.

@abmyii

This comment has been minimized.

Copy link
Contributor

abmyii commented Dec 8, 2019

I take it this doesn't allow spectators to see team-chat in game? Otherwise looks good.

@abmyii
abmyii approved these changes Dec 8, 2019
@abcdefg30

This comment has been minimized.

Copy link
Member Author

abcdefg30 commented Dec 8, 2019

I take it this doesn't allow spectators to see team-chat in game?

Yes, only when viewing replays.

@abmyii

This comment has been minimized.

Copy link
Contributor

abmyii commented Dec 8, 2019

Great, can't wait for this useful feature!

@teinarss teinarss merged commit 2918eca into OpenRA:bleed Dec 10, 2019
2 checks passed
2 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@abcdefg30 abcdefg30 deleted the abcdefg30:fixTeam branch Dec 10, 2019
@teinarss

This comment has been minimized.

Copy link
Contributor

teinarss commented Dec 10, 2019

prep 1130ccf

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.