From ad78f747c1853f616040e0fe77d484c9a160a2d5 Mon Sep 17 00:00:00 2001 From: Remuchi Date: Tue, 26 Mar 2024 16:01:54 +0700 Subject: [PATCH] =?UTF-8?q?fix:=20=D0=BF=D0=BE=D0=BC=D0=BE=D0=B3=D0=B8?= =?UTF-8?q?=D1=82=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Changeling/ChangelingSystem.Abilities.cs | 4 ---- .../_White/Carrying/CarryingSystem.cs | 10 +++------- Content.Shared/Chat/ChatSelectChannel.cs | 2 +- .../Containers/ItemSlot/ItemSlotsSystem.cs | 4 ++++ .../EntitySystems/SharedHandsSystem.Drop.cs | 1 - .../_White/Jukebox/JukeboxSharedSystem.cs | 17 ++++++++++------- .../Wizard/ScrollSystem/SharedScrollSystem.cs | 3 +-- 7 files changed, 19 insertions(+), 22 deletions(-) diff --git a/Content.Server/Changeling/ChangelingSystem.Abilities.cs b/Content.Server/Changeling/ChangelingSystem.Abilities.cs index 2154870c19..025d9d3ce1 100644 --- a/Content.Server/Changeling/ChangelingSystem.Abilities.cs +++ b/Content.Server/Changeling/ChangelingSystem.Abilities.cs @@ -15,8 +15,6 @@ using Content.Server.GameTicking.Rules; using Content.Server.Humanoid; using Content.Server.IdentityManagement; using Content.Server.Mind; -using Content.Server.NPC.Components; -using Content.Server.NPC.Systems; using Content.Server.Polymorph.Systems; using Content.Server.Popups; using Content.Server.Store.Components; @@ -44,8 +42,6 @@ using Content.Shared.Miracle.UI; using Content.Shared.Mobs; using Content.Shared.Mobs.Systems; using Content.Shared.Ninja.Components; -using Content.Shared.Pulling; -using Content.Shared.Pulling.Components; using Content.Shared.Standing; using Content.Shared.StatusEffect; using Content.Shared.Tag; diff --git a/Content.Server/_White/Carrying/CarryingSystem.cs b/Content.Server/_White/Carrying/CarryingSystem.cs index c73d748565..cce1465c1a 100644 --- a/Content.Server/_White/Carrying/CarryingSystem.cs +++ b/Content.Server/_White/Carrying/CarryingSystem.cs @@ -1,9 +1,7 @@ using System.Threading; using Content.Server.DoAfter; -using Content.Server.Hands.Systems; using Content.Server.Resist; using Content.Server.Popups; -using Content.Server.Contests; using Content.Server.Inventory; using Content.Shared._White.Crossbow; using Content.Shared.Mobs; @@ -17,15 +15,14 @@ using Content.Shared.Verbs; using Content.Shared.Carrying; using Content.Shared.Movement.Events; using Content.Shared.Movement.Systems; -using Content.Shared.Pulling; -using Content.Shared.Pulling.Components; using Content.Shared.Standing; using Content.Shared.ActionBlocker; using Content.Shared.Climbing.Events; using Content.Shared.Inventory.VirtualItem; using Content.Shared.Throwing; -using Content.Shared.Physics.Pull; using Content.Shared.Mobs.Systems; +using Content.Shared.Movement.Pulling.Events; +using Content.Shared.Movement.Pulling.Systems; using Robust.Shared.Map.Components; namespace Content.Server.Carrying @@ -37,11 +34,10 @@ namespace Content.Server.Carrying [Dependency] private readonly DoAfterSystem _doAfterSystem = default!; [Dependency] private readonly StandingStateSystem _standingState = default!; [Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!; - [Dependency] private readonly SharedPullingSystem _pullingSystem = default!; + [Dependency] private readonly PullingSystem _pullingSystem = default!; [Dependency] private readonly MobStateSystem _mobStateSystem = default!; [Dependency] private readonly EscapeInventorySystem _escapeInventorySystem = default!; [Dependency] private readonly PopupSystem _popupSystem = default!; - [Dependency] private readonly ContestsSystem _contests = default!; [Dependency] private readonly MovementSpeedModifierSystem _movementSpeed = default!; [Dependency] private readonly PenetratedSystem _penetrated = default!; diff --git a/Content.Shared/Chat/ChatSelectChannel.cs b/Content.Shared/Chat/ChatSelectChannel.cs index 1871ed0b71..134877be2f 100644 --- a/Content.Shared/Chat/ChatSelectChannel.cs +++ b/Content.Shared/Chat/ChatSelectChannel.cs @@ -7,7 +7,7 @@ /// Maps to , giving better names. /// [Flags] - public enum ChatSelectChannel : ushort + public enum ChatSelectChannel : uint { None = 0, diff --git a/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs b/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs index c79eb2957d..ea8ec674e2 100644 --- a/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs +++ b/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs @@ -13,6 +13,8 @@ using Content.Shared.Verbs; using Robust.Shared.Audio.Systems; using Robust.Shared.Containers; using Robust.Shared.GameStates; +using Robust.Shared.Network; +using Robust.Shared.Timing; using Robust.Shared.Utility; namespace Content.Shared.Containers.ItemSlots @@ -32,6 +34,8 @@ namespace Content.Shared.Containers.ItemSlots [Dependency] private readonly SharedPopupSystem _popupSystem = default!; [Dependency] private readonly SharedHandsSystem _handsSystem = default!; [Dependency] private readonly SharedAudioSystem _audioSystem = default!; + [Dependency] private readonly INetManager _netManager = default!; + [Dependency] private readonly IGameTiming _timing = default!; public override void Initialize() { diff --git a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Drop.cs b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Drop.cs index 9b78916524..e071cdc693 100644 --- a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Drop.cs +++ b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Drop.cs @@ -3,7 +3,6 @@ using Content.Shared.Hands.Components; using Content.Shared.Interaction; using Content.Shared.Inventory.VirtualItem; using Content.Shared.Tag; -using Content.Shared.Pulling.Components; using Robust.Shared.Containers; using Robust.Shared.Map; diff --git a/Content.Shared/_White/Jukebox/JukeboxSharedSystem.cs b/Content.Shared/_White/Jukebox/JukeboxSharedSystem.cs index 1468f5f085..a57d5b8909 100644 --- a/Content.Shared/_White/Jukebox/JukeboxSharedSystem.cs +++ b/Content.Shared/_White/Jukebox/JukeboxSharedSystem.cs @@ -3,12 +3,11 @@ using Robust.Shared.Network; namespace Content.Shared._White.Jukebox; -public class JukeboxSharedSystem : EntitySystem +public sealed class JukeboxSharedSystem : EntitySystem { [Dependency] private readonly SharedContainerSystem _containerSystem = default!; [Dependency] private readonly INetManager _netManager = default!; - public override void Initialize() { base.Initialize(); @@ -17,8 +16,11 @@ public class JukeboxSharedSystem : EntitySystem public void OnJukeboxInit(EntityUid uid, JukeboxComponent component, ComponentStartup args) { - component.TapeContainer = _containerSystem.EnsureContainer(uid, JukeboxComponent.JukeboxContainerName); - component.DefaultSongsContainer = _containerSystem.EnsureContainer(uid, JukeboxComponent.JukeboxDefaultSongsName); + component.TapeContainer = + _containerSystem.EnsureContainer(uid, JukeboxComponent.JukeboxContainerName); + + component.DefaultSongsContainer = + _containerSystem.EnsureContainer(uid, JukeboxComponent.JukeboxDefaultSongsName); if (_netManager.IsServer) { @@ -28,10 +30,11 @@ public class JukeboxSharedSystem : EntitySystem { var tapeUid = EntityManager.SpawnEntity(tapePrototype, transform.MapPosition); - if(!TryComp(tapeUid, out _)) continue; + if (!TryComp(tapeUid, out _)) + continue; - component.DefaultSongsContainer.Insert(tapeUid); + _containerSystem.Insert(tapeUid, component.DefaultSongsContainer); } } } -} +} \ No newline at end of file diff --git a/Content.Shared/_White/Wizard/ScrollSystem/SharedScrollSystem.cs b/Content.Shared/_White/Wizard/ScrollSystem/SharedScrollSystem.cs index 6d267eaf17..78fe528d1d 100644 --- a/Content.Shared/_White/Wizard/ScrollSystem/SharedScrollSystem.cs +++ b/Content.Shared/_White/Wizard/ScrollSystem/SharedScrollSystem.cs @@ -40,8 +40,7 @@ public abstract class SharedScrollSystem : EntitySystem var doAfterEventArgs = new DoAfterArgs(EntityManager, args.User, component.LearnTime, new ScrollDoAfterEvent(), uid, target: uid) { - BreakOnTargetMove = true, - BreakOnUserMove = true, + BreakOnMove = true, BreakOnDamage = true, NeedHand = true };