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

Revert "virtualize all net ids to reduce net traffic"

Browse Source 
This reverts commit 027c338c5f.

Formatting fix left in.
This commit is contained in:
Tyler Young
2020-06-08 16:49:05 -04:00
parent e85b839d27
commit c3fd0ef882
25 changed files with 31 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Shared/GameObjects/Components/Mobs/SharedCombatModeComponent.cs
View File

@@ -57,9 +57,9 @@ namespace Content.Shared.GameObjects.Components.Mobs
{
public bool IsInCombatMode { get; }
public TargetingZone TargetingZone { get; }
public override uint NetID => ContentNetIDs.COMBATMODE;
public CombatModeComponentState(bool isInCombatMode, TargetingZone targetingZone)
: base(ContentNetIDs.COMBATMODE)
{
IsInCombatMode = isInCombatMode;
TargetingZone = targetingZone;

4
Content.Shared/GameObjects/Components/Mobs/SharedHumanoidAppearanceComponent.cs
View File

@@ -69,9 +69,7 @@ namespace Content.Shared.GameObjects.Components.Mobs
[NetSerializable]
private sealed class HumanoidAppearanceComponentState : ComponentState
{
public override uint NetID => ContentNetIDs.HUMANOID_APPEARANCE;
public HumanoidAppearanceComponentState(HumanoidCharacterAppearance appearance, Sex sex)
public HumanoidAppearanceComponentState(HumanoidCharacterAppearance appearance, Sex sex) : base(ContentNetIDs.HUMANOID_APPEARANCE)
{
Appearance = appearance;
Sex = sex;

3
Content.Shared/GameObjects/Components/Mobs/SharedOverlayEffectsComponent.cs
View File

@@ -24,9 +24,8 @@ namespace Content.Shared.GameObjects.Components.Mobs
public class OverlayEffectComponentState : ComponentState
{
public ScreenEffects ScreenEffect;
public override uint NetID => ContentNetIDs.OVERLAYEFFECTS;
public OverlayEffectComponentState(ScreenEffects screenEffect)
public OverlayEffectComponentState(ScreenEffects screenEffect) : base(ContentNetIDs.OVERLAYEFFECTS)
{
ScreenEffect = screenEffect;
}

3
Content.Shared/GameObjects/Components/Mobs/SharedStatusEffectsComponent.cs
View File

@@ -19,9 +19,8 @@ namespace Content.Shared.GameObjects.Components.Mobs
public class StatusEffectComponentState : ComponentState
{
public Dictionary<StatusEffect, string> StatusEffects;
public override uint NetID => ContentNetIDs.STATUSEFFECTS;
public StatusEffectComponentState(Dictionary<StatusEffect, string> statusEffects)
public StatusEffectComponentState(Dictionary<StatusEffect, string> statusEffects) : base(ContentNetIDs.STATUSEFFECTS)
{
StatusEffects = statusEffects;
}