Inline UID
This commit is contained in:
@@ -35,7 +35,7 @@ namespace Content.Server.Lock
|
||||
|
||||
private void OnStartup(EntityUid uid, LockComponent lockComp, ComponentStartup args)
|
||||
{
|
||||
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(lockComp.Owner.Uid, out AppearanceComponent? appearance))
|
||||
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(lockComp.Owner, out AppearanceComponent? appearance))
|
||||
{
|
||||
appearance.SetData(StorageVisuals.CanLock, true);
|
||||
}
|
||||
@@ -64,7 +64,7 @@ namespace Content.Server.Lock
|
||||
args.PushText(Loc.GetString(lockComp.Locked
|
||||
? "lock-comp-on-examined-is-locked"
|
||||
: "lock-comp-on-examined-is-unlocked",
|
||||
("entityName", Name: IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(lockComp.Owner.Uid).EntityName)));
|
||||
("entityName", Name: IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(lockComp.Owner).EntityName)));
|
||||
}
|
||||
|
||||
public bool TryLock(EntityUid uid, IEntity user, LockComponent? lockComp = null)
|
||||
@@ -78,7 +78,7 @@ namespace Content.Server.Lock
|
||||
if (!HasUserAccess(uid, user, quiet: false))
|
||||
return false;
|
||||
|
||||
lockComp.Owner.PopupMessage(user, Loc.GetString("lock-comp-do-lock-success", ("entityName",Name: IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(lockComp.Owner.Uid).EntityName)));
|
||||
lockComp.Owner.PopupMessage(user, Loc.GetString("lock-comp-do-lock-success", ("entityName",Name: IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(lockComp.Owner).EntityName)));
|
||||
lockComp.Locked = true;
|
||||
|
||||
if(lockComp.LockSound != null)
|
||||
@@ -86,12 +86,12 @@ namespace Content.Server.Lock
|
||||
SoundSystem.Play(Filter.Pvs(lockComp.Owner), lockComp.LockSound.GetSound(), lockComp.Owner, AudioParams.Default.WithVolume(-5));
|
||||
}
|
||||
|
||||
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(lockComp.Owner.Uid, out AppearanceComponent? appearanceComp))
|
||||
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(lockComp.Owner, out AppearanceComponent? appearanceComp))
|
||||
{
|
||||
appearanceComp.SetData(StorageVisuals.Locked, true);
|
||||
}
|
||||
|
||||
RaiseLocalEvent(lockComp.Owner.Uid, new LockToggledEvent(true));
|
||||
RaiseLocalEvent(lockComp.Owner, new LockToggledEvent(true));
|
||||
|
||||
return true;
|
||||
}
|
||||
@@ -107,7 +107,7 @@ namespace Content.Server.Lock
|
||||
if (!HasUserAccess(uid, user, quiet: false))
|
||||
return false;
|
||||
|
||||
lockComp.Owner.PopupMessage(user, Loc.GetString("lock-comp-do-unlock-success", ("entityName", Name: IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(lockComp.Owner.Uid).EntityName)));
|
||||
lockComp.Owner.PopupMessage(user, Loc.GetString("lock-comp-do-unlock-success", ("entityName", Name: IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(lockComp.Owner).EntityName)));
|
||||
lockComp.Locked = false;
|
||||
|
||||
if(lockComp.UnlockSound != null)
|
||||
@@ -115,12 +115,12 @@ namespace Content.Server.Lock
|
||||
SoundSystem.Play(Filter.Pvs(lockComp.Owner), lockComp.UnlockSound.GetSound(), lockComp.Owner, AudioParams.Default.WithVolume(-5));
|
||||
}
|
||||
|
||||
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(lockComp.Owner.Uid, out AppearanceComponent? appearanceComp))
|
||||
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(lockComp.Owner, out AppearanceComponent? appearanceComp))
|
||||
{
|
||||
appearanceComp.SetData(StorageVisuals.Locked, false);
|
||||
}
|
||||
|
||||
RaiseLocalEvent(lockComp.Owner.Uid, new LockToggledEvent(false));
|
||||
RaiseLocalEvent(lockComp.Owner, new LockToggledEvent(false));
|
||||
|
||||
return true;
|
||||
}
|
||||
@@ -150,7 +150,7 @@ namespace Content.Server.Lock
|
||||
if (!Resolve(uid, ref reader))
|
||||
return true;
|
||||
|
||||
if (!_accessReader.IsAllowed(reader, user.Uid))
|
||||
if (!_accessReader.IsAllowed(reader, user))
|
||||
{
|
||||
if (!quiet)
|
||||
reader.Owner.PopupMessage(user, Loc.GetString("lock-comp-has-user-access-fail"));
|
||||
|
||||
Reference in New Issue
Block a user