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

use lidgren's new spans (#1164)

Browse Source 
update solution
This commit is contained in:
Tyler Young
2020-06-24 11:57:59 -04:00
committed by GitHub
parent ca1fb126e7
commit 623e47f19d
3 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Content.Shared/Content.Shared.csproj
View File

@@ -26,7 +26,6 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="GameObjects\Components\Construction\" />
<Folder Include="GameObjects\Components\Trigger\" />
<EmbeddedResource Include="Text\Names\*.txt" />
<Folder Include="GameObjects\Components\Visualizers" />

14
Content.Shared/Preferences/SharedPreferencesManager.cs
View File

@@ -30,14 +30,13 @@ namespace Content.Shared.Preferences
{
var serializer = IoCManager.Resolve<IRobustSerializer>();
var length = buffer.ReadInt32();
var bytes = buffer.ReadBytes(length);
using (var stream = new MemoryStream(bytes))
using (var stream = buffer.ReadAsStream(length))
{
Preferences = serializer.Deserialize<PlayerPreferences>(stream);
}
length = buffer.ReadInt32();
bytes = buffer.ReadBytes(length);
using (var stream = new MemoryStream(bytes))
using (var stream = buffer.ReadAsStream(length))
{
Settings = serializer.Deserialize<GameSettings>(stream);
}
@@ -110,11 +109,8 @@ namespace Content.Shared.Preferences
Slot = buffer.ReadInt32();
var serializer = IoCManager.Resolve<IRobustSerializer>();
var length = buffer.ReadInt32();
var bytes = buffer.ReadBytes(length);
using (var stream = new MemoryStream(bytes))
{
Profile = serializer.Deserialize<ICharacterProfile>(stream);
}
using var stream = buffer.ReadAsStream(length);
Profile = serializer.Deserialize<ICharacterProfile>(stream);
}
public override void WriteToBuffer(NetOutgoingMessage buffer)