rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Servers Hub Fixes

Browse source
This commit is contained in:
VigersRay 2024-06-04 10:54:08 +03:00
parent ca60f708ea
commit 144ee3c489
3 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Content.Client/Launcher/LauncherConnectingGui.xaml
View file

@ -52,7 +52,7 @@
</BoxContainer>
</BoxContainer>
</PanelContainer>
<PanelContainer StyleClasses="AngleRect" HorizontalExpand="True" Margin="5 0 0 0" Name="ServersHub" MinWidth="600" MinHeight="220">
<PanelContainer StyleClasses="AngleRect" HorizontalExpand="True" Margin="0 10 0 0" Name="ServersHub" MinWidth="600" MinHeight="220">
<BoxContainer Orientation="Vertical" VerticalExpand="True" HorizontalExpand="True" Margin="3 3 3 3">
<ScrollContainer VerticalExpand="True" HScrollEnabled="False" HorizontalExpand="True">
<serversHub:ServersHub Name="ServersHubBody" Access="Public" />

2
Content.Client/Lobby/UI/LobbyGui.xaml
View file

@ -55,7 +55,7 @@
</BoxContainer>
</PanelContainer>
<!-- Sunrise-edit: Servers Hub -->
<PanelContainer StyleClasses="AngleRect" HorizontalExpand="True" Margin="5 0 0 0" Name="ServersHub" MinWidth="600" MinHeight="200">
<PanelContainer StyleClasses="AngleRect" HorizontalExpand="True" Margin="0 10 0 0" Name="ServersHub" MinWidth="600" MinHeight="200">
<BoxContainer Orientation="Vertical" VerticalExpand="True" HorizontalExpand="True" Margin="3 3 3 3">
<ScrollContainer VerticalExpand="True" HScrollEnabled="False" HorizontalExpand="True">
<serversHub:ServersHub Name="ServersHubBody" Access="Public" />

20
Content.Server/_Sunrise/ServersHub/ServersHubManager.cs
View file

@ -50,7 +50,21 @@ public sealed partial class ServersHubManager
private void OnServerListChanged(string serverList)
{
_serversList = serverList.Split(',').ToList();
var urls = new List<string>();
foreach (var serverUrl in serverList.Split(','))
{
try
{
var uri = new Uri(serverUrl);
urls.Add(uri.AbsoluteUri);
}
catch (UriFormatException)
{
}
}
_serversList = urls;
}
// Ахуенный план, надеждный блядь как швейцарские часы нахуй.
@ -72,11 +86,11 @@ public sealed partial class ServersHubManager
private async Task UpdateServerData()
{
_serverDataList.Clear();
if (_serversList.Count == 0)
return;
_serverDataList.Clear();
foreach (var serverUrl in _serversList)
{
var data = await RefreshServerData(serverUrl);