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

Minor code doc correction #12756

Conversation

riverwanderer
Copy link
Collaborator

File extension = vsav.

@riverwanderer riverwanderer added the documentation Improvements or additions to documentation label Sep 28, 2023
@riverwanderer riverwanderer added this to the 3.7.2 milestone Sep 28, 2023
@riverwanderer riverwanderer self-assigned this Sep 28, 2023
@riverwanderer riverwanderer added the Ready to Merge YeeeeeeeeeeeHAW!!! label Sep 28, 2023
@@ -496,6 +496,7 @@ public void finish() {
if (GameModule.getGameModule().isMultiplayerConnected()) {
final Command c = new Chatter.DisplayText(GameModule.getGameModule().getChatter(), Resources.getString(GlobalOptions.getInstance().chatterHTMLSupport() ? "PlayerRoster.joined_side_2" : "PlayerRoster.joined_side", GameModule.getGameModule().getPrefs().getValue(GameModule.REAL_NAME), translateSide(newSide)));
c.execute();
GameModule.getGameModule().getServer().sendToOthers(c);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this change intended to be included?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not really. That change is in PR #12750.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like the only commit which should be in this PR is 635bc26, in that case.

Would you be able to drop the other commits? (The simplest way is probably an interactive rebase.)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's not what I meant---the unnecessary commits are still there, plus one more which undoes them. What I was asking for was a rebase that takes those commits out of the PR.

@riverwanderer riverwanderer deleted the minor-code-doc-correction branch September 29, 2023 00:09
@riverwanderer riverwanderer added Build Only - Do not merge and removed documentation Improvements or additions to documentation Ready to Merge YeeeeeeeeeeeHAW!!! labels Sep 29, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants