Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 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

4
Content.Shared/Weapons/Melee/Events/AttackEvent.cs
View File

@@ -10,9 +10,9 @@ namespace Content.Shared.Weapons.Melee.Events
/// <summary>
/// Coordinates being attacked.
/// </summary>
public readonly EntityCoordinates Coordinates;
public readonly NetCoordinates Coordinates;
protected AttackEvent(EntityCoordinates coordinates)
protected AttackEvent(NetCoordinates coordinates)
{
Coordinates = coordinates;
}

4
Content.Shared/Weapons/Melee/Events/DisarmAttackEvent.cs
View File

@@ -6,9 +6,9 @@ namespace Content.Shared.Weapons.Melee.Events;
[Serializable, NetSerializable]
public sealed class DisarmAttackEvent : AttackEvent
{
public EntityUid? Target;
public NetEntity? Target;
public DisarmAttackEvent(EntityUid? target, EntityCoordinates coordinates) : base(coordinates)
public DisarmAttackEvent(NetEntity? target, NetCoordinates coordinates) : base(coordinates)
{
Target = target;
}

6
Content.Shared/Weapons/Melee/Events/HeavyAttackEvent.cs
View File

@@ -9,14 +9,14 @@ namespace Content.Shared.Weapons.Melee.Events;
[Serializable, NetSerializable]
public sealed class HeavyAttackEvent : AttackEvent
{
public readonly EntityUid Weapon;
public readonly NetEntity Weapon;
/// <summary>
/// As what the client swung at will not match server we'll have them tell us what they hit so we can verify.
/// </summary>
public List<EntityUid> Entities;
public List<NetEntity> Entities;
public HeavyAttackEvent(EntityUid weapon, List<EntityUid> entities, EntityCoordinates coordinates) : base(coordinates)
public HeavyAttackEvent(NetEntity weapon, List<NetEntity> entities, NetCoordinates coordinates) : base(coordinates)
{
Weapon = weapon;
Entities = entities;

6
Content.Shared/Weapons/Melee/Events/LightAttackEvent.cs
View File

@@ -9,10 +9,10 @@ namespace Content.Shared.Weapons.Melee.Events;
[Serializable, NetSerializable]
public sealed class LightAttackEvent : AttackEvent
{
public readonly EntityUid? Target;
public readonly EntityUid Weapon;
public readonly NetEntity? Target;
public readonly NetEntity Weapon;
public LightAttackEvent(EntityUid? target, EntityUid weapon, EntityCoordinates coordinates) : base(coordinates)
public LightAttackEvent(NetEntity? target, NetEntity weapon, NetCoordinates coordinates) : base(coordinates)
{
Target = target;
Weapon = weapon;

6
Content.Shared/Weapons/Melee/Events/MeleeLungeEvent.cs
View File

@@ -9,7 +9,7 @@ namespace Content.Shared.Weapons.Melee.Events;
[Serializable, NetSerializable]
public sealed class MeleeLungeEvent : EntityEventArgs
{
public EntityUid Entity;
public NetEntity Entity;
/// <summary>
/// Width of the attack angle.
@@ -26,9 +26,9 @@ public sealed class MeleeLungeEvent : EntityEventArgs
/// </summary>
public string? Animation;
public MeleeLungeEvent(EntityUid uid, Angle angle, Vector2 localPos, string? animation)
public MeleeLungeEvent(NetEntity entity, Angle angle, Vector2 localPos, string? animation)
{
Entity = uid;
Entity = entity;
Angle = angle;
LocalPos = localPos;
Animation = animation;

4
Content.Shared/Weapons/Melee/Events/StopAttackEvent.cs
View File

@@ -5,9 +5,9 @@ namespace Content.Shared.Weapons.Melee.Events;
[Serializable, NetSerializable]
public sealed class StopAttackEvent : EntityEventArgs
{
public readonly EntityUid Weapon;
public readonly NetEntity Weapon;
public StopAttackEvent(EntityUid weapon)
public StopAttackEvent(NetEntity weapon)
{
Weapon = weapon;
}