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

Forensic fixes (#18681)

Browse Source
This commit is contained in:
metalgearsloth
2023-08-05 13:41:33 +10:00
committed by GitHub
parent a5ed3af5b1
commit a46b718241
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Content.Server/Forensics/Systems/ForensicsSystem.cs
View File

@@ -11,8 +11,8 @@ namespace Content.Server.Forensics
public override void Initialize() public override void Initialize()
{ {
SubscribeLocalEvent<FingerprintComponent, ContactInteractionEvent>(OnInteract); SubscribeLocalEvent<FingerprintComponent, ContactInteractionEvent>(OnInteract);
SubscribeLocalEvent<FingerprintComponent, ComponentInit>(OnFingeprintInit); SubscribeLocalEvent<FingerprintComponent, MapInitEvent>(OnFingerprintInit);
SubscribeLocalEvent<DnaComponent, ComponentInit>(OnDNAInit); SubscribeLocalEvent<DnaComponent, MapInitEvent>(OnDNAInit);
} }
private void OnInteract(EntityUid uid, FingerprintComponent component, ContactInteractionEvent args) private void OnInteract(EntityUid uid, FingerprintComponent component, ContactInteractionEvent args)
@@ -20,31 +20,31 @@ namespace Content.Server.Forensics
ApplyEvidence(uid, args.Other); ApplyEvidence(uid, args.Other);
} }
private void OnFingeprintInit(EntityUid uid, FingerprintComponent component, ComponentInit args) private void OnFingerprintInit(EntityUid uid, FingerprintComponent component, MapInitEvent args)
{ {
component.Fingerprint = GenerateFingerprint(); component.Fingerprint = GenerateFingerprint();
} }
private void OnDNAInit(EntityUid uid, DnaComponent component, ComponentInit args) private void OnDNAInit(EntityUid uid, DnaComponent component, MapInitEvent args)
{ {
component.DNA = GenerateDNA(); component.DNA = GenerateDNA();
} }
private string GenerateFingerprint() private string GenerateFingerprint()
{ {
byte[] fingerprint = new byte[16]; var fingerprint = new byte[16];
_random.NextBytes(fingerprint); _random.NextBytes(fingerprint);
return Convert.ToHexString(fingerprint); return Convert.ToHexString(fingerprint);
} }
private string GenerateDNA() private string GenerateDNA()
{ {
var letters = new List<string> { "A", "C", "G", "T" }; var letters = new[] { "A", "C", "G", "T" };
string DNA = String.Empty; var DNA = string.Empty;
for (int i = 0; i < 16; i++) for (var i = 0; i < 16; i++)
{ {
DNA += letters[_random.Next(letters.Count)]; DNA += letters[_random.Next(letters.Length)];
} }
return DNA; return DNA;