vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(1256d7edc) Fixed servers using a local campaign save path sent by the client setupping the campaign. Closes #1564

Browse Source
This commit is contained in:
Joonas Rikkonen
2019-06-12 16:45:44 +03:00
parent adab8589da
commit a92e01b6af
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/Source/Networking/GameClient.cs
+4 -2
View File
@@ -2047,13 +2047,15 @@ namespace Barotrauma.Networking
client.SendMessage(msg, NetDeliveryMethod.ReliableUnordered); client.SendMessage(msg, NetDeliveryMethod.ReliableUnordered);
} }
public void SetupNewCampaign(Submarine sub, string savePath, string mapSeed) public void SetupNewCampaign(Submarine sub, string saveName, string mapSeed)
{ {
saveName = Path.GetFileNameWithoutExtension(saveName);
NetOutgoingMessage msg = client.CreateMessage(); NetOutgoingMessage msg = client.CreateMessage();
msg.Write((byte)ClientPacketHeader.CAMPAIGN_SETUP_INFO); msg.Write((byte)ClientPacketHeader.CAMPAIGN_SETUP_INFO);
msg.Write(true); msg.WritePadBits(); msg.Write(true); msg.WritePadBits();
msg.Write(savePath); msg.Write(saveName);
msg.Write(mapSeed); msg.Write(mapSeed);
msg.Write(sub.Name); msg.Write(sub.Name);
msg.Write(sub.MD5Hash.Hash); msg.Write(sub.MD5Hash.Hash);
Barotrauma/BarotraumaServer/Source/Networking/GameServer.cs
+6 -2
View File
@@ -728,7 +728,7 @@ namespace Barotrauma.Networking
bool isNew = inc.ReadBoolean(); inc.ReadPadBits(); bool isNew = inc.ReadBoolean(); inc.ReadPadBits();
if (isNew) if (isNew)
{ {
string savePath = inc.ReadString(); string saveName = inc.ReadString();
string seed = inc.ReadString(); string seed = inc.ReadString();
string subName = inc.ReadString(); string subName = inc.ReadString();
string subHash = inc.ReadString(); string subHash = inc.ReadString();
@@ -743,7 +743,11 @@ namespace Barotrauma.Networking
} }
else else
{ {
if (connectedClient.HasPermission(ClientPermissions.SelectMode)) MultiPlayerCampaign.StartNewCampaign(savePath, matchingSub.FilePath, seed); string localSavePath = SaveUtil.CreateSavePath(SaveUtil.SaveType.Multiplayer, saveName);
if (connectedClient.HasPermission(ClientPermissions.SelectMode))
{
MultiPlayerCampaign.StartNewCampaign(localSavePath, matchingSub.FilePath, seed);
}
} }
} }
else else