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

Enable nullability in Content.Server (#3685)

Browse Source
This commit is contained in:
DrSmugleaf
2021-03-16 15:50:20 +01:00
committed by GitHub
parent 90fec0ed24
commit a5ade526b7
306 changed files with 1616 additions and 1441 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Content.Server/GameObjects/Components/MagicMirrorComponent.cs
View File

@@ -59,14 +59,9 @@ namespace Content.Server.GameObjects.Components
if (!map.ContainsKey(msg.HairName))
return;
if (msg.IsFacialHair)
{
looks.Appearance = looks.Appearance.WithFacialHairStyleName(msg.HairName);
}
else
{
looks.Appearance = looks.Appearance.WithHairStyleName(msg.HairName);
}
looks.Appearance = msg.IsFacialHair
? looks.Appearance.WithFacialHairStyleName(msg.HairName)
: looks.Appearance.WithHairStyleName(msg.HairName);
break;
@@ -74,14 +69,9 @@ namespace Content.Server.GameObjects.Components
var (r, g, b) = msg.HairColor;
var color = new Color(r, g, b);
if (msg.IsFacialHair)
{
looks.Appearance = looks.Appearance.WithFacialHairColor(color);
}
else
{
looks.Appearance = looks.Appearance.WithHairColor(color);
}
looks.Appearance = msg.IsFacialHair
? looks.Appearance.WithFacialHairColor(color)
: looks.Appearance.WithHairColor(color);
break;
@@ -110,8 +100,14 @@ namespace Content.Server.GameObjects.Components
UserInterface?.Toggle(actor.playerSession);
var msg = new MagicMirrorInitialDataMessage(looks.Appearance.HairColor, looks.Appearance.FacialHairColor, looks.Appearance.HairStyleName,
looks.Appearance.FacialHairStyleName, looks.Appearance.EyeColor);
var appearance = looks.Appearance;
var msg = new MagicMirrorInitialDataMessage(
appearance.HairColor,
appearance.FacialHairColor,
appearance.HairStyleName,
appearance.FacialHairStyleName,
appearance.EyeColor);
UserInterface?.SendMessage(msg, actor.playerSession);
}