cmdrunematti
/
Delta-v
mirror of https://github.com/DeltaV-Station/Delta-v.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ActionBlocker CanEmote uses EntityUid exclusively

This commit is contained in:
Vera Aguilera Puerto 2021-11-09 13:41:24 +01:00
parent d4ded87448
commit b82cb38bf9
3 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Chat/Managers/ChatManager.cs
View File

@ -195,7 +195,7 @@ namespace Content.Server.Chat.Managers
public void EntityMe(IEntity source, string action) public void EntityMe(IEntity source, string action)
{ {
if (!EntitySystem.Get<ActionBlockerSystem>().CanEmote(source)) if (!EntitySystem.Get<ActionBlockerSystem>().CanEmote(source.Uid))
{ {
return; return;
} }

14
Content.Shared/ActionBlocker/ActionBlockerSystem.cs
View File

@ -89,18 +89,12 @@ namespace Content.Shared.ActionBlocker
return CanPickup(EntityManager.GetEntity(uid)); return CanPickup(EntityManager.GetEntity(uid));
} }
public bool CanEmote(IEntity entity)
{
var ev = new EmoteAttemptEvent(entity);
RaiseLocalEvent(entity.Uid, ev);
return !ev.Cancelled;
}
public bool CanEmote(EntityUid uid) public bool CanEmote(EntityUid uid)
{ {
return CanEmote(EntityManager.GetEntity(uid)); var ev = new EmoteAttemptEvent(uid);
RaiseLocalEvent(uid, ev);
return !ev.Cancelled;
} }
public bool CanAttack(EntityUid uid) public bool CanAttack(EntityUid uid)

6
Content.Shared/Emoting/EmoteAttemptEvent.cs
View File

@ -4,11 +4,11 @@ namespace Content.Shared.Emoting
{ {
public class EmoteAttemptEvent : CancellableEntityEventArgs public class EmoteAttemptEvent : CancellableEntityEventArgs
{ {
public EmoteAttemptEvent(IEntity entity) public EmoteAttemptEvent(EntityUid uid)
{ {
Entity = entity; Uid = uid;
} }
public IEntity Entity { get; } public EntityUid Uid { get; }
} }
} }