From 219fc5c83b5e04fc9910f7ba972cdbe6a675b1f2 Mon Sep 17 00:00:00 2001
From: Adrian Noori <adrianoori@gmail.com>
Date: Tue, 17 Jan 2023 20:26:09 -0500
Subject: [PATCH 1/3] Update ServerDetailsWindow.xaml crossplay

Added checkbox for crossplay
---
 ServerDetailsWindow.xaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ServerDetailsWindow.xaml b/ServerDetailsWindow.xaml
index 8f3f0eb..ecb57df 100644
--- a/ServerDetailsWindow.xaml
+++ b/ServerDetailsWindow.xaml
@@ -1,4 +1,4 @@
-<Window x:Class="ValheimServerWarden.ServerDetailsWindow"
+<Window x:Class="ValheimServerWarden.ServerDetailsWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -251,6 +251,7 @@
                                 </TextBox.ContextMenu>
                             </TextBox>
                             <CheckBox x:Name="chkPublic" Content="Public" Margin="5,5,0,5" VerticalAlignment="Top" Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" ToolTip="Whether server is listed in the in-game community server list"/>
+							<CheckBox x:Name="chkCrossplay" Content="Crossplay" Margin="5,5,0,5" VerticalAlignment="Top" Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="2" ToolTip="Whether cross-play is enabled between different platforms"/>
                         </Grid>
                     </Border>
                     <Label Content="Management Settings" Grid.Row="2" Margin="10,5,0,0"/>

From b9f6db49857dc621d3fc65ca93a40a21e40ed507 Mon Sep 17 00:00:00 2001
From: Adrian Noori <adrianoori@gmail.com>
Date: Tue, 17 Jan 2023 20:27:49 -0500
Subject: [PATCH 2/3] Update ServerDetailsWindow.xaml.cs

Added crossplay support logic
---
 ServerDetailsWindow.xaml.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ServerDetailsWindow.xaml.cs b/ServerDetailsWindow.xaml.cs
index ad1bbf3..0ffe757 100644
--- a/ServerDetailsWindow.xaml.cs
+++ b/ServerDetailsWindow.xaml.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Diagnostics;
@@ -257,6 +257,7 @@ private void ServerToControls()
                 txtPassword.Text = Server.Password;
                 txtSaveDir.Text = Server.SaveDir;
                 chkPublic.IsChecked = Server.Public;
+                chkCrossplay.IsChecked = Server.Crossplay;
                 if (Server.InstallPath != null)
                 {
                     txtServerDir.Text = Server.InstallPath;
@@ -427,6 +428,7 @@ private void btnSave_Click(object sender, RoutedEventArgs e)
             Server.Password = txtPassword.Text;
             Server.SaveDir = txtSaveDir.Text;
             Server.Public = chkPublic.IsChecked.GetValueOrDefault();
+            Server.Crossplay = chkCrossplay.IsChecked.GetValueOrDefault();
             Server.InstallPath = txtServerDir.Text;
             Server.InstallMethod = (ValheimServer.ServerInstallMethod)cmbServerType.SelectedIndex;
 

From d0c9dedddc80775441a127564fb62c716190bf23 Mon Sep 17 00:00:00 2001
From: Adrian Noori <adrianoori@gmail.com>
Date: Tue, 17 Jan 2023 20:28:54 -0500
Subject: [PATCH 3/3] Update ValheimServer.cs

added crossplay support logic
---
 ValheimServer.cs | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/ValheimServer.cs b/ValheimServer.cs
index c5ce28b..92b9c57 100644
--- a/ValheimServer.cs
+++ b/ValheimServer.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Linq;
@@ -69,6 +69,7 @@ struct ServerData
             internal string password;
             internal string savedir;
             internal bool pub;
+            internal bool crossplay;
             internal bool autostart;
             internal bool rawlog;
             internal int restartHours;
@@ -207,6 +208,17 @@ public bool Public
                 this.data.pub = value;
             }
         }
+        public bool Crossplay
+        {
+            get
+            {
+                return this.data.crossplay;
+            }
+            set
+            {
+                this.data.crossplay = value;
+            }
+        }
         public bool Autostart
         {
             get
@@ -468,7 +480,7 @@ static ValheimServer()
                 }
             }).Start();
         }
-        public ValheimServer(string name, int port, string world, string password, bool pubserver, bool autostart, bool rawlog, int restarthours, bool updateonrestart, int updatecheckminutes, string discordwebhook, Dictionary<string,string> discordmessages, Dictionary<string, string> discordservereventnames, ServerInstallMethod install, string instpath, ProcessPriorityClass processpriority, bool umodupdating)
+        public ValheimServer(string name, int port, string world, string password, bool pubserver, bool crossplay, bool autostart, bool rawlog, int restarthours, bool updateonrestart, int updatecheckminutes, string discordwebhook, Dictionary<string,string> discordmessages, Dictionary<string, string> discordservereventnames, ServerInstallMethod install, string instpath, ProcessPriorityClass processpriority, bool umodupdating)
         {
             this.data.name = name;
             this.data.port = 2456;
@@ -476,6 +488,7 @@ public ValheimServer(string name, int port, string world, string password, bool
             this.data.password = password;
             this.data.savedir = "";
             this.data.pub = pubserver;
+            this.data.crossplay = crossplay;
             this.data.autostart = autostart;
             this.data.rawlog = rawlog;
             this.data.restartHours = restarthours;
@@ -558,11 +571,11 @@ private void RestartTimer_Elapsed(object sender, System.Timers.ElapsedEventArgs
             }
         }
 
-        public ValheimServer() : this("My Server", 2456, "Dedicated", "Secret", false, false, false, 0, false, 0, null, new Dictionary<string, string>(), new Dictionary<string, string>(), ServerInstallMethod.Manual, Properties.Settings.Default.ServerFilePath, ProcessPriorityClass.Normal, false)
+        public ValheimServer() : this("My Server", 2456, "Dedicated", "Secret", false, false, false, false, 0, false, 0, null, new Dictionary<string, string>(), new Dictionary<string, string>(), ServerInstallMethod.Manual, Properties.Settings.Default.ServerFilePath, ProcessPriorityClass.Normal, false)
         {
         }
 
-        public ValheimServer(string name) : this(name, 2456, "Dedicated", "Secret", false, false, false, 0, false, 0, null, new Dictionary<string,string>(), new Dictionary<string, string>(), ServerInstallMethod.Manual, Properties.Settings.Default.ServerFilePath, ProcessPriorityClass.Normal, false)
+        public ValheimServer(string name) : this(name, 2456, "Dedicated", "Secret", false, false, false, false, 0, false, 0, null, new Dictionary<string,string>(), new Dictionary<string, string>(), ServerInstallMethod.Manual, Properties.Settings.Default.ServerFilePath, ProcessPriorityClass.Normal, false)
         {
 
         }
@@ -936,6 +949,10 @@ private void StartServer()
                     return;
                 }
                 string arguments = $"-nographics -batchmode -name \"{this.Name}\" -port {this.Port} -world \"{this.World}\" -public {Convert.ToInt32(Public)}";
+                if (this.Crossplay)
+                {
+                    arguments += " -crossplay";
+                }
                 if (Password != null & Password.Length > 0)
                 {
                     arguments += $" -password \"{this.Password}\"";