tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix/ECS SharedEmotingComponent.

Browse Source 
IActionBlocker -> events
Fix networking.
This commit is contained in:
Pieter-Jan Briers
2021-09-15 16:17:09 +02:00
parent 7cee263955
commit 9733d35de7
2 changed files with 37 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Shared/Emoting/EmoteSystem.cs
View File

@@ -8,15 +8,13 @@ namespace Content.Shared.Emoting
{
base.Initialize();
SubscribeLocalEvent<EmoteAttemptEvent>(OnEmoteAttempt);
SubscribeLocalEvent<SharedEmotingComponent, EmoteAttemptEvent>(OnEmoteAttempt);
}
private void OnEmoteAttempt(EmoteAttemptEvent ev)
{
if (!ev.Entity.HasComponent<SharedEmotingComponent>())
private void OnEmoteAttempt(EntityUid entity, SharedEmotingComponent component, EmoteAttemptEvent ev)
{
if (!component.Enabled)
ev.Cancel();
}
}
}
}

39
Content.Shared/Emoting/SharedEmotingComponent.cs
View File

@@ -1,26 +1,55 @@
using Content.Shared.ActionBlocker;
using System;
using Robust.Shared.GameObjects;
using Robust.Shared.GameStates;
using Robust.Shared.Players;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.Serialization;
using Robust.Shared.ViewVariables;
namespace Content.Shared.Emoting
{
[RegisterComponent]
public class SharedEmotingComponent : Component, IActionBlocker
[RegisterComponent, NetworkedComponent]
public class SharedEmotingComponent : Component
{
[DataField("enabled")] private bool _enabled = true;
public override string Name => "Emoting";
[ViewVariables(VVAccess.ReadWrite)]
public bool Enabled
{
get => _enabled;
set
{
if (_enabled == value) return;
if (_enabled == value)
return;
_enabled = value;
Dirty();
}
}
bool IActionBlocker.CanEmote() => Enabled;
public override ComponentState GetComponentState(ICommonSession player)
{
return new EmotingComponentState(Enabled);
}
public override void HandleComponentState(ComponentState? curState, ComponentState? nextState)
{
if (curState is not EmotingComponentState emoting)
return;
_enabled = emoting.Enabled;
}
[Serializable, NetSerializable]
private sealed class EmotingComponentState : ComponentState
{
public bool Enabled { get; }
public EmotingComponentState(bool enabled)
{
Enabled = enabled;
}
}
}
}