Ensure EUIs close themselves (#15860)

This commit is contained in:
Leon Friedrich
2023-04-29 15:16:24 +12:00
committed by GitHub
parent 58300598e2
commit cedec8d415
34 changed files with 79 additions and 128 deletions

View File

@@ -32,11 +32,10 @@ namespace Content.Server.Administration.UI
public override void HandleMessage(EuiMessageBase msg)
{
base.HandleMessage(msg);
switch (msg)
{
case AdminAnnounceEuiMsg.Close:
Close();
break;
case AdminAnnounceEuiMsg.DoAnnounce doAnnounce:
if (!_adminManager.HasAdminFlag(Player, AdminFlags.Admin))
{

View File

@@ -38,15 +38,5 @@ namespace Content.Server.Administration.UI
var solutions = _entityManager.GetComponentOrNull<SolutionContainerManagerComponent>(Target)?.Solutions;
return new EditSolutionsEuiState(Target, solutions);
}
public override void HandleMessage(EuiMessageBase msg)
{
switch (msg)
{
case EditSolutionsEuiMsg.Close:
Close();
break;
}
}
}
}

View File

@@ -86,14 +86,10 @@ namespace Content.Server.Administration.UI
public override async void HandleMessage(EuiMessageBase msg)
{
base.HandleMessage(msg);
switch (msg)
{
case Close _:
{
Close();
break;
}
case AddAdmin ca:
{
await HandleCreateAdmin(ca);

View File

@@ -14,11 +14,7 @@ public sealed class SpawnExplosionEui : BaseEui
{
public override void HandleMessage(EuiMessageBase msg)
{
if (msg is SpawnExplosionEuiMsg.Close)
{
Close();
return;
}
base.HandleMessage(msg);
if (msg is not SpawnExplosionEuiMsg.PreviewRequest request)
return;