Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Content update for NetEntities (#18935)

Browse Source
This commit is contained in:
metalgearsloth
2023-09-11 09:42:41 +10:00
committed by GitHub
parent 389c8d1a2c
commit 5a0fc68be2
526 changed files with 3058 additions and 2215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs
View File

@@ -152,7 +152,7 @@ namespace Content.Server.Medical.BiomassReclaimer
if (!HasComp<MobStateComponent>(args.Used) || !CanGib(uid, args.Used, component))
return;
_doAfterSystem.TryStartDoAfter(new DoAfterArgs(args.User, 7f, new ReclaimerDoAfterEvent(), uid, target: args.Target, used: args.Used)
_doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, args.User, 7f, new ReclaimerDoAfterEvent(), uid, target: args.Target, used: args.Used)
{
BreakOnTargetMove = true,
BreakOnUserMove = true,

2
Content.Server/Medical/CrewMonitoring/CrewMonitoringConsoleSystem.cs
View File

@@ -59,7 +59,7 @@ namespace Content.Server.Medical.CrewMonitoring
// update all sensors info
var allSensors = component.ConnectedSensors.Values.ToList();
UserInterfaceSystem.SetUiState(bui, new CrewMonitoringState(allSensors, component.Snap, component.Precision));
_uiSystem.SetUiState(bui, new CrewMonitoringState(allSensors, component.Snap, component.Precision));
}
}
}

6
Content.Server/Medical/CryoPodSystem.cs
View File

@@ -134,7 +134,7 @@ public sealed partial class CryoPodSystem: SharedCryoPodSystem
if (cryoPodComponent.BodyContainer.ContainedEntity != null)
return;
var doAfterArgs = new DoAfterArgs(args.User, cryoPodComponent.EntryDelay, new CryoPodDragFinished(), uid, target: args.Dragged, used: uid)
var doAfterArgs = new DoAfterArgs(EntityManager, args.User, cryoPodComponent.EntryDelay, new CryoPodDragFinished(), uid, target: args.Dragged, used: uid)
{
BreakOnDamage = true,
BreakOnTargetMove = true,
@@ -184,8 +184,8 @@ public sealed partial class CryoPodSystem: SharedCryoPodSystem
_userInterfaceSystem.TrySendUiMessage(
uid,
HealthAnalyzerUiKey.Key,
new HealthAnalyzerScannedUserMessage(cryoPodComponent.BodyContainer.ContainedEntity,
temp != null ? temp.CurrentTemperature : 0, bloodstream != null ? bloodstream.BloodSolution.FillFraction : 0));
new HealthAnalyzerScannedUserMessage(GetNetEntity(cryoPodComponent.BodyContainer.ContainedEntity),
temp?.CurrentTemperature ?? 0, bloodstream != null ? bloodstream.BloodSolution.FillFraction : 0));
}
private void OnInteractUsing(EntityUid uid, CryoPodComponent cryoPodComponent, InteractUsingEvent args)

2
Content.Server/Medical/DefibrillatorSystem.cs
View File

@@ -177,7 +177,7 @@ public sealed class DefibrillatorSystem : EntitySystem
return false;
_audio.PlayPvs(component.ChargeSound, uid);
return _doAfter.TryStartDoAfter(new DoAfterArgs(user, component.DoAfterDuration, new DefibrillatorZapDoAfterEvent(),
return _doAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, user, component.DoAfterDuration, new DefibrillatorZapDoAfterEvent(),
uid, target, uid)
{
BlockDuplicate = true,

2
Content.Server/Medical/HealingSystem.cs
View File

@@ -187,7 +187,7 @@ public sealed class HealingSystem : EntitySystem
: component.Delay * GetScaledHealingPenalty(user, component);
var doAfterEventArgs =
new DoAfterArgs(user, delay, new HealingDoAfterEvent(), target, target: target, used: uid)
new DoAfterArgs(EntityManager, user, delay, new HealingDoAfterEvent(), target, target: target, used: uid)
{
//Raise the event on the target if it's not self, otherwise raise it on self.
BreakOnUserMove = true,

4
Content.Server/Medical/HealthAnalyzerSystem.cs
View File

@@ -32,7 +32,7 @@ namespace Content.Server.Medical
_audio.PlayPvs(healthAnalyzer.ScanningBeginSound, uid);
_doAfterSystem.TryStartDoAfter(new DoAfterArgs(args.User, healthAnalyzer.ScanDelay, new HealthAnalyzerDoAfterEvent(), uid, target: args.Target, used: uid)
_doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, args.User, healthAnalyzer.ScanDelay, new HealthAnalyzerDoAfterEvent(), uid, target: args.Target, used: uid)
{
BreakOnTargetMove = true,
BreakOnUserMove = true,
@@ -75,7 +75,7 @@ namespace Content.Server.Medical
OpenUserInterface(user, healthAnalyzer);
_uiSystem.SendUiMessage(healthAnalyzer.UserInterface, new HealthAnalyzerScannedUserMessage(target, temp != null ? temp.CurrentTemperature : float.NaN,
_uiSystem.SendUiMessage(healthAnalyzer.UserInterface, new HealthAnalyzerScannedUserMessage(GetNetEntity(target), temp != null ? temp.CurrentTemperature : float.NaN,
bloodstream != null ? bloodstream.BloodSolution.FillFraction : float.NaN));
}
}

2
Content.Server/Medical/Stethoscope/StethoscopeSystem.cs
View File

@@ -105,7 +105,7 @@ namespace Content.Server.Medical.Stethoscope
// construct the doafter and start it
private void StartListening(EntityUid scope, EntityUid user, EntityUid target, StethoscopeComponent comp)
{
_doAfterSystem.TryStartDoAfter(new DoAfterArgs(user, comp.Delay, new StethoscopeDoAfterEvent(), scope, target: target, used: scope)
_doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, user, comp.Delay, new StethoscopeDoAfterEvent(), scope, target: target, used: scope)
{
BreakOnTargetMove = true,
BreakOnUserMove = true,

8
Content.Server/Medical/SuitSensors/SuitSensorSystem.cs
View File

@@ -321,7 +321,7 @@ namespace Content.Server.Medical.SuitSensors
totalDamage = damageable.TotalDamage.Int();
// finally, form suit sensor status
var status = new SuitSensorStatus(uid, userName, userJob);
var status = new SuitSensorStatus(GetNetEntity(uid), userName, userJob);
switch (sensor.Mode)
{
case SuitSensorMode.SensorBinary:
@@ -353,7 +353,7 @@ namespace Content.Server.Medical.SuitSensors
coordinates = EntityCoordinates.Invalid;
}
status.Coordinates = coordinates;
status.Coordinates = GetNetCoordinates(coordinates);
break;
}
@@ -404,11 +404,11 @@ namespace Content.Server.Medical.SuitSensors
payload.TryGetValue(SuitSensorConstants.NET_TOTAL_DAMAGE, out int? totalDamage);
payload.TryGetValue(SuitSensorConstants.NET_COORDINATES, out EntityCoordinates? cords);
var status = new SuitSensorStatus(suitSensorUid, name, job)
var status = new SuitSensorStatus(GetNetEntity(suitSensorUid), name, job)
{
IsAlive = isAlive.Value,
TotalDamage = totalDamage,
Coordinates = cords,
Coordinates = GetNetCoordinates(cords),
};
return status;
}