diff --git a/osu.Game/Online/Chat/ChannelManager.cs b/osu.Game/Online/Chat/ChannelManager.cs
index 3af11ff20f..4f6066cab1 100644
--- a/osu.Game/Online/Chat/ChannelManager.cs
+++ b/osu.Game/Online/Chat/ChannelManager.cs
@@ -213,8 +213,27 @@ namespace osu.Game.Online.Chat
PostMessage(content, true);
break;
+ case "join":
+ if (string.IsNullOrWhiteSpace(content))
+ {
+ target.AddNewMessages(new ErrorMessage("Usage: /join [channel]"));
+ break;
+ }
+
+ var channel = availableChannels.Where(c => c.Name == content || c.Name == $"#{content}").FirstOrDefault();
+
+ if (channel == null)
+ {
+ target.AddNewMessages(new ErrorMessage($"Channel '{content}' not found."));
+ break;
+ }
+
+ JoinChannel(channel);
+ CurrentChannel.Value = channel;
+ break;
+
case "help":
- target.AddNewMessages(new InfoMessage("Supported commands: /help, /me [action]"));
+ target.AddNewMessages(new InfoMessage("Supported commands: /help, /me [action], /join [channel]"));
break;
default:
diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index 2e863f7edb..ba2375bec1 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -313,6 +313,9 @@ namespace osu.Game.Rulesets.Scoring
///
/// Applies the score change of a to this .
///
+ ///
+ /// Any changes applied via this method can be reverted via .
+ ///
/// The to apply.
protected virtual void ApplyResult(JudgementResult result)
{
@@ -357,7 +360,7 @@ namespace osu.Game.Rulesets.Scoring
}
///
- /// Reverts the score change of a that was applied to this .
+ /// Reverts the score change of a that was applied to this via .
///
/// The judgement scoring result.
protected virtual void RevertResult(JudgementResult result)