diff --git a/OpenDreamClient/Rendering/ClientDreamParticlesSystem.cs b/OpenDreamClient/Rendering/ClientDreamParticlesSystem.cs index 929af157c0..1484e026a0 100644 --- a/OpenDreamClient/Rendering/ClientDreamParticlesSystem.cs +++ b/OpenDreamClient/Rendering/ClientDreamParticlesSystem.cs @@ -37,12 +37,11 @@ private void OnDreamParticlesComponentChange(EntityUid uid, DreamParticlesCompon private void HandleComponentAdd(EntityUid uid, DreamParticlesComponent component, ref ComponentAdd args) { - component.particlesSystem = _particlesManager.CreateParticleSystem(uid, GetParticleSystemArgs(component)); + _particlesManager.CreateParticleSystem(uid, GetParticleSystemArgs(component)); } private void HandleComponentRemove(EntityUid uid, DreamParticlesComponent component, ref ComponentRemove args) { - component.particlesSystem = null; _particlesManager.DestroyParticleSystem(uid); } diff --git a/OpenDreamClient/Rendering/DreamParticlesComponent.cs b/OpenDreamClient/Rendering/DreamParticlesComponent.cs deleted file mode 100644 index 8d5ac27bd8..0000000000 --- a/OpenDreamClient/Rendering/DreamParticlesComponent.cs +++ /dev/null @@ -1,11 +0,0 @@ - -using OpenDreamShared.Rendering; -using Robust.Client.Graphics; -using Robust.Shared.GameStates; - -namespace OpenDreamClient.Rendering; - -[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true)] -public sealed partial class DreamParticlesComponent : SharedDreamParticlesComponent { - public ParticleSystem? particlesSystem; -} diff --git a/OpenDreamClient/Rendering/DreamViewOverlay.cs b/OpenDreamClient/Rendering/DreamViewOverlay.cs index e3b3ea3726..d5e7e0172a 100644 --- a/OpenDreamClient/Rendering/DreamViewOverlay.cs +++ b/OpenDreamClient/Rendering/DreamViewOverlay.cs @@ -59,7 +59,6 @@ internal sealed partial class DreamViewOverlay : Overlay { private readonly ClientImagesSystem _clientImagesSystem; private readonly EntityQuery _spriteQuery; - private readonly EntityQuery _particlesQuery; private readonly EntityQuery _xformQuery; private readonly EntityQuery _mobSightQuery; @@ -91,7 +90,6 @@ public DreamViewOverlay(RenderTargetPool renderTargetPool, TransformSystem trans _clientImagesSystem = clientImagesSystem; _spriteQuery = _entityManager.GetEntityQuery(); - _particlesQuery = _entityManager.GetEntityQuery(); _xformQuery = _entityManager.GetEntityQuery(); _mobSightQuery = _entityManager.GetEntityQuery(); diff --git a/OpenDreamRuntime/Rendering/DreamParticlesComponent.cs b/OpenDreamRuntime/Rendering/DreamParticlesComponent.cs deleted file mode 100644 index f5a213f0bc..0000000000 --- a/OpenDreamRuntime/Rendering/DreamParticlesComponent.cs +++ /dev/null @@ -1,8 +0,0 @@ -using OpenDreamShared.Rendering; -using Robust.Shared.GameObjects; -using Robust.Shared.GameStates; - -namespace OpenDreamShared.Rendering; - -[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true)] -public sealed partial class DreamParticlesComponent : SharedDreamParticlesComponent {} diff --git a/OpenDreamShared/Rendering/DreamParticlesComponent.cs b/OpenDreamShared/Rendering/DreamParticlesComponent.cs index b8c02e8f8b..7dce99ea3c 100644 --- a/OpenDreamShared/Rendering/DreamParticlesComponent.cs +++ b/OpenDreamShared/Rendering/DreamParticlesComponent.cs @@ -11,8 +11,8 @@ namespace OpenDreamShared.Rendering; -[NetworkedComponent, AutoGenerateComponentState(true)] -public abstract partial class SharedDreamParticlesComponent : Component { +[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true)] +public sealed partial class DreamParticlesComponent : Component { [ViewVariables(VVAccess.ReadWrite), AutoNetworkedField] public int Width; [ViewVariables(VVAccess.ReadWrite), AutoNetworkedField] public int Height; [ViewVariables(VVAccess.ReadWrite), AutoNetworkedField] public int Count;