tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Replace ResourcePath with ResPath (#15308)" (#15551)

Browse Source
This commit is contained in:
metalgearsloth
2023-04-20 11:43:54 +10:00
committed by GitHub
parent 9b99fcbcef
commit acf79a8209
124 changed files with 273 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Content.Shared/Administration/NetworkResourceUploadMessage.cs
View File

@@ -11,13 +11,13 @@ public sealed class NetworkResourceUploadMessage : NetMessage
public override MsgGroups MsgGroup => MsgGroups.Command;
public byte[] Data { get; set; } = Array.Empty<byte>();
public ResPath RelativePath { get; set; } = ResPath.Self;
public ResourcePath RelativePath { get; set; } = ResourcePath.Self;
public NetworkResourceUploadMessage()
{
}
public NetworkResourceUploadMessage(byte[] data, ResPath relativePath)
public NetworkResourceUploadMessage(byte[] data, ResourcePath relativePath)
{
Data = data;
RelativePath = relativePath;
@@ -27,8 +27,7 @@ public sealed class NetworkResourceUploadMessage : NetMessage
{
var dataLength = buffer.ReadVariableInt32();
Data = buffer.ReadBytes(dataLength);
// What is the second argument here?
RelativePath = new ResPath(buffer.ReadString());
RelativePath = new ResourcePath(buffer.ReadString(), buffer.ReadString());
}
public override void WriteToBuffer(NetOutgoingMessage buffer, IRobustSerializer serializer)
@@ -36,6 +35,6 @@ public sealed class NetworkResourceUploadMessage : NetMessage
buffer.WriteVariableInt32(Data.Length);
buffer.Write(Data);
buffer.Write(RelativePath.ToString());
buffer.Write(ResPath.Separator);
buffer.Write(RelativePath.Separator);
}
}