фиксы апстрима

space-sunrise · Jan 5, 2025 · 6055ef2 · 6055ef2
1 parent 692edc0
commit 6055ef2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/Content.Client/Lobby/LobbyState.cs b/Content.Client/Lobby/LobbyState.cs
@@ -36,7 +36,6 @@ namespace Content.Client.Lobby
     public sealed class LobbyState : Robust.Client.State.State
     {
         [Dependency] private readonly IBaseClient _baseClient = default!;
-        [Dependency] private readonly IConfigurationManager _cfg = default!;
         [Dependency] private readonly IClientConsoleHost _consoleHost = default!;
         [Dependency] private readonly IEntityManager _entityManager = default!;
         [Dependency] private readonly IResourceCache _resourceCache = default!;
@@ -84,7 +83,7 @@ protected override void Startup()
             //     : lobbyNameCvar;
 
             var width = _cfg.GetCVar(CCVars.ServerLobbyRightPanelWidth);
-            Lobby.RightSide.SetWidth = width;
+            Lobby.RightPanel.SetWidth = width;
 
             UpdateLobbyUi();
 

diff --git a/Content.Client/Lobby/UI/LobbyGui.xaml b/Content.Client/Lobby/UI/LobbyGui.xaml
@@ -146,7 +146,7 @@
                 </BoxContainer>
             </BoxContainer>
             <BoxContainer Orientation="Vertical" HorizontalExpand="True" HorizontalAlignment="Right">
-                <PanelContainer Name="RightPanel" MinWidth="500" StyleClasses="AngleRect" VerticalExpand="True"
+                <PanelContainer Name="RightPanel" Access="Public" MinWidth="500" StyleClasses="AngleRect" VerticalExpand="True"
                                 VerticalAlignment="Stretch" HorizontalExpand="True">
                     <BoxContainer Orientation="Vertical" VerticalExpand="True" HorizontalExpand="True"
                                   VerticalAlignment="Stretch" SeparationOverride="4">

diff --git a/Content.Server/_Sunrise/SniperZoom/ZoomableGunSystem.cs b/Content.Server/_Sunrise/SniperZoom/ZoomableGunSystem.cs
@@ -34,9 +34,7 @@ private void OnItemWieldedEvent(EntityUid uid, ZoomableGunComponent comp, ItemWi
     private void OnItemUnwieldedEvent(EntityUid uid, ZoomableGunComponent comp, ItemUnwieldedEvent ev)
     {
         comp.Wielded = false;
-        if (ev.User == null)
-            return;
-        DisableZoom(ev.User.Value, comp);
+        DisableZoom(ev.User, comp);
     }
 
     private void EnableZoom(EntityUid uid, ZoomableGunComponent comp)