From a78452c8452b5c06e8f785d324b458c883d7b4bf Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Tue, 8 Dec 2020 22:17:00 +1100 Subject: [PATCH] Fix disposals do_after (#2722) * Fix disposals do_after * DataField instead * Update Content.Server/GameObjects/Components/Disposal/DisposalMailingUnitComponent.cs Co-authored-by: Vera Aguilera Puerto <6766154+Zumorica@users.noreply.github.com> * Update Content.Server/GameObjects/Components/Disposal/DisposalUnitComponent.cs Co-authored-by: Metal Gear Sloth Co-authored-by: Vera Aguilera Puerto <6766154+Zumorica@users.noreply.github.com> --- .../Disposal/DisposalMailingUnitComponent.cs | 6 +-- .../Disposal/DisposalUnitComponent.cs | 6 +-- Resources/Maps/saltern.yml | 51 +++++++------------ 3 files changed, 19 insertions(+), 44 deletions(-) diff --git a/Content.Server/GameObjects/Components/Disposal/DisposalMailingUnitComponent.cs b/Content.Server/GameObjects/Components/Disposal/DisposalMailingUnitComponent.cs index 0ff6193b43..f358fc1d5d 100644 --- a/Content.Server/GameObjects/Components/Disposal/DisposalMailingUnitComponent.cs +++ b/Content.Server/GameObjects/Components/Disposal/DisposalMailingUnitComponent.cs @@ -584,11 +584,7 @@ namespace Content.Server.GameObjects.Components.Disposal seconds => _flushDelay = TimeSpan.FromSeconds(seconds), () => (int) _flushDelay.TotalSeconds); - serializer.DataReadWriteFunction( - "entryDelay", - 0.5f, - seconds => _entryDelay = seconds, - () => (int) _entryDelay); + serializer.DataField(ref _entryDelay, "entryDelay", 0.5f); serializer.DataField(ref _tag, "Tag", ""); } diff --git a/Content.Server/GameObjects/Components/Disposal/DisposalUnitComponent.cs b/Content.Server/GameObjects/Components/Disposal/DisposalUnitComponent.cs index 061fd9a0ba..f22e01e374 100644 --- a/Content.Server/GameObjects/Components/Disposal/DisposalUnitComponent.cs +++ b/Content.Server/GameObjects/Components/Disposal/DisposalUnitComponent.cs @@ -525,11 +525,7 @@ namespace Content.Server.GameObjects.Components.Disposal seconds => _flushDelay = TimeSpan.FromSeconds(seconds), () => (int) _flushDelay.TotalSeconds); - serializer.DataReadWriteFunction( - "entryDelay", - 0.5f, - seconds => _entryDelay = seconds, - () => (int) _entryDelay); + serializer.DataField(ref _entryDelay, "entryDelay", 0.5f); } public override void Initialize() diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml index d1f49cabfe..22f03a0b0c 100644 --- a/Resources/Maps/saltern.yml +++ b/Resources/Maps/saltern.yml @@ -1593,8 +1593,7 @@ entities: pos: -17.5,-22.5 rot: 3.141592653589793 rad type: Transform - - entryDelay: 0 - type: DisposalUnit + - type: DisposalUnit - containers: DisposalUnit: type: Robust.Server.GameObjects.Components.Container.Container @@ -1678,8 +1677,7 @@ entities: pos: -29.5,11.5 rot: -1.5707963267948966 rad type: Transform - - entryDelay: 0 - type: DisposalUnit + - type: DisposalUnit - containers: DisposalUnit: type: Robust.Server.GameObjects.Components.Container.Container @@ -1783,8 +1781,7 @@ entities: pos: -5.5,17.5 rot: -1.5707963267948966 rad type: Transform - - entryDelay: 0 - type: DisposalUnit + - type: DisposalUnit - containers: DisposalUnit: type: Robust.Server.GameObjects.Components.Container.Container @@ -1840,8 +1837,7 @@ entities: pos: 6.5,11.5 rot: 3.141592653589793 rad type: Transform - - entryDelay: 0 - type: DisposalUnit + - type: DisposalUnit - containers: DisposalUnit: type: Robust.Server.GameObjects.Components.Container.Container @@ -1908,8 +1904,7 @@ entities: pos: 24.5,8.5 rot: -1.5707963267948966 rad type: Transform - - entryDelay: 0 - type: DisposalUnit + - type: DisposalUnit - containers: DisposalUnit: type: Robust.Server.GameObjects.Components.Container.Container @@ -2056,8 +2051,7 @@ entities: pos: 34.5,-4.5 rot: 3.141592653589793 rad type: Transform - - entryDelay: 0 - type: DisposalUnit + - type: DisposalUnit - containers: DisposalUnit: type: Robust.Server.GameObjects.Components.Container.Container @@ -2190,8 +2184,7 @@ entities: pos: 37.5,6.5 rot: -1.5707963267948966 rad type: Transform - - entryDelay: 0 - type: DisposalUnit + - type: DisposalUnit - containers: DisposalUnit: type: Robust.Server.GameObjects.Components.Container.Container @@ -2545,8 +2538,7 @@ entities: pos: -2.5,29.5 rot: 3.141592653589793 rad type: Transform - - entryDelay: 0 - type: DisposalUnit + - type: DisposalUnit - containers: DisposalUnit: type: Robust.Server.GameObjects.Components.Container.Container @@ -2810,8 +2802,7 @@ entities: pos: 11.5,-11.5 rot: 3.141592653589793 rad type: Transform - - entryDelay: 0 - type: DisposalUnit + - type: DisposalUnit - containers: DisposalUnit: type: Robust.Server.GameObjects.Components.Container.Container @@ -2877,8 +2868,7 @@ entities: pos: 12.5,-2.5 rot: 3.141592653589793 rad type: Transform - - entryDelay: 0 - type: DisposalUnit + - type: DisposalUnit - containers: DisposalUnit: type: Robust.Server.GameObjects.Components.Container.Container @@ -3231,8 +3221,7 @@ entities: pos: 0.5,1.5 rot: -1.5707963267948966 rad type: Transform - - entryDelay: 0 - type: DisposalUnit + - type: DisposalUnit - containers: DisposalUnit: type: Robust.Server.GameObjects.Components.Container.Container @@ -3538,8 +3527,7 @@ entities: pos: -12.5,1.5 rot: -1.5707963267948966 rad type: Transform - - entryDelay: 0 - type: DisposalUnit + - type: DisposalUnit - containers: DisposalUnit: type: Robust.Server.GameObjects.Components.Container.Container @@ -3650,8 +3638,7 @@ entities: pos: -22.5,6.5 rot: 3.141592653589793 rad type: Transform - - entryDelay: 0 - type: DisposalUnit + - type: DisposalUnit - containers: DisposalUnit: type: Robust.Server.GameObjects.Components.Container.Container @@ -3960,8 +3947,7 @@ entities: pos: -27.5,-8.5 rot: 1.5707963267948966 rad type: Transform - - entryDelay: 0 - type: DisposalUnit + - type: DisposalUnit - containers: DisposalUnit: type: Robust.Server.GameObjects.Components.Container.Container @@ -4006,8 +3992,7 @@ entities: pos: -10.5,-17.5 rot: -1.5707963267948966 rad type: Transform - - entryDelay: 0 - type: DisposalUnit + - type: DisposalUnit - containers: DisposalUnit: type: Robust.Server.GameObjects.Components.Container.Container @@ -7763,8 +7748,7 @@ entities: pos: -5.5,-14.5 rot: -1.5707963267948966 rad type: Transform - - entryDelay: 0 - type: DisposalUnit + - type: DisposalUnit - containers: DisposalUnit: type: Robust.Server.GameObjects.Components.Container.Container @@ -20810,8 +20794,7 @@ entities: - parent: 855 pos: 18.5,-0.5 type: Transform - - entryDelay: 0 - type: DisposalUnit + - type: DisposalUnit - containers: DisposalUnit: type: Robust.Server.GameObjects.Components.Container.Container