cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-07-18 03:23:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
Jordan Dominion
2024-03-28 14:16:40 -04:00
parent 04fd02c589 aba366da71
commit 905db37eef
4 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/rerun-flaky-tests.yml
+1
View File
@@ -6,6 +6,7 @@ on:
- completed
jobs:
rerun_flaky_tests:
name: Rerun Flaky Tests
runs-on: ubuntu-latest
if: ${{ github.event.workflow_run.conclusion == 'failure' && github.event.workflow_run.run_attempt == 1 }}
steps:
.github/workflows/scripts/package.json
+3
View File
@@ -0,0 +1,3 @@
{
"type": "module"
}
build/Version.props
+1 -1
View File
@@ -3,7 +3,7 @@
<!-- Integration tests will ensure they match across the board -->
<Import Project="WebpanelVersion.props" />
<PropertyGroup>
<TgsCoreVersion>6.4.0</TgsCoreVersion>
<TgsCoreVersion>6.4.1</TgsCoreVersion>
<TgsConfigVersion>5.1.0</TgsConfigVersion>
<TgsApiVersion>10.2.0</TgsApiVersion>
<TgsCommonLibraryVersion>7.0.0</TgsCommonLibraryVersion>
src/Tgstation.Server.Host/Components/Chat/ChatManager.cs
+3 -3
View File
@@ -839,7 +839,7 @@ namespace Tgstation.Server.Host.Components.Chat
splits.RemoveAt(0);
var arguments = String.Join(" ", splits);
Tuple<ICommand, IChatTrackingContext?>? GetCommand()
Tuple<ICommand, IChatTrackingContext?>? GetCommand(string command)
{
if (!builtinCommands.TryGetValue(command, out var handler))
return trackingContexts
@@ -867,7 +867,7 @@ namespace Tgstation.Server.Host.Components.Chat
}
else
{
var helpTuple = GetCommand();
var helpTuple = GetCommand(splits[0]);
if (helpTuple != default)
{
var (helpHandler, _) = helpTuple;
@@ -881,7 +881,7 @@ namespace Tgstation.Server.Host.Components.Chat
return;
}
var tuple = GetCommand();
var tuple = GetCommand(command);
if (tuple == default)
{