Fix gamemode transmission while joining a game (SubnauticaNitrox#1175)

dartasen · web-flow · commit dc6aa45c0069 · 2020-07-23T22:11:58.000-07:00
* Fix GameMode transmission while joining a game

* minor
diff --git a/NitroxClient/GameLogic/InitialSync/PlayerInitialSyncProcessor.cs b/NitroxClient/GameLogic/InitialSync/PlayerInitialSyncProcessor.cs
@@ -1,12 +1,12 @@
-﻿using System;
-using System.Collections;
+﻿using System.Collections;
 using NitroxClient.Communication.Abstract;
 using NitroxClient.GameLogic.InitialSync.Base;
 using NitroxClient.MonoBehaviours;
 using NitroxModel.DataStructures;
 using NitroxModel.DataStructures.GameLogic;
 using NitroxModel.Logger;
 using NitroxModel.Packets;
+using NitroxModel.Server;
 using UnityEngine;
 
 namespace NitroxClient.GameLogic.InitialSync
@@ -36,15 +36,15 @@ public override IEnumerator Process(InitialPlayerSync packet, WaitScreen.ManualW
             waitScreenItem.SetProgress(0.75f);
             yield return null;
 
-            SetPlayerGameMode((GameModeOption)Enum.Parse(typeof(GameModeOption), packet.GameMode));
+            SetPlayerGameMode(packet.GameMode);
             waitScreenItem.SetProgress(1f);
             yield return null;
         }
 
         private void SetPlayerGameObjectId(NitroxId id)
         {
             NitroxEntity.SetNewId(Player.mainObject, id);
-            Log.Info("Received initial sync Player GameObject Id: " + id);
+            Log.Info($"Received initial sync player GameObject Id: {id}");
         }
 
         private void AddStartingItemsToPlayer(bool firstTimeConnecting)
@@ -81,10 +81,10 @@ private void SetPlayerStats(PlayerStatsData statsData)
             }
         }
         
-        private void SetPlayerGameMode(GameModeOption gameMode)
+        private void SetPlayerGameMode(ServerGameMode gameMode)
         {
-            Log.Info("Recieved initial sync packet with game mode " + gameMode);
-            GameModeUtils.SetGameMode(gameMode, GameModeOption.None);
+            Log.Info($"Received initial sync packet with gamemode {gameMode}");
+            GameModeUtils.SetGameMode((GameModeOption)(int)gameMode, GameModeOption.None);
         }
     }
 }
diff --git a/NitroxModel/Packets/InitialPlayerSync.cs b/NitroxModel/Packets/InitialPlayerSync.cs
@@ -4,6 +4,7 @@
 using NitroxModel.DataStructures;
 using NitroxModel.DataStructures.GameLogic;
 using NitroxModel.DataStructures.Util;
+using NitroxModel.Server;
 
 namespace NitroxModel.Packets
 {
@@ -27,7 +28,7 @@ public class InitialPlayerSync : Packet, IShortString
         public PlayerStatsData PlayerStatsData { get; }
         public List<InitialRemotePlayerData> RemotePlayerData { get; }
         public List<Entity> GlobalRootEntities { get; }
-        public string GameMode { get; }
+        public ServerGameMode GameMode { get; }
         public Perms Permissions { get; }
 
         public InitialPlayerSync(NitroxId playerGameObjectId,
@@ -47,7 +48,7 @@ public InitialPlayerSync(NitroxId playerGameObjectId,
             PlayerStatsData playerStatsData,
             IEnumerable<InitialRemotePlayerData> remotePlayerData,
             IEnumerable<Entity> globalRootEntities,
-            string gameMode,
+            ServerGameMode gameMode,
             Perms perms)
         {
             EscapePodsData = escapePodsData.ToList();
@@ -73,15 +74,12 @@ public InitialPlayerSync(NitroxId playerGameObjectId,
 
         public override string ToString()
         {
-            return "[InitialPlayerSync - EquippedItems: " + EquippedItems + " BasePieces: " + BasePieces + " Vehicles: " + Vehicles + " InventoryItems: " + InventoryItems + " PDAData: " + PDAData + " StoryGoalData: " + StoryGoalData + "]";
+            return $"[InitialPlayerSync - GameMode: {GameMode}, EquippedItems: {EquippedItems} BasePieces: {BasePieces} Vehicles: {Vehicles} InventoryItems: {InventoryItems} PDAData: {PDAData} StoryGoalData: {StoryGoalData}]";
         }
 
         public string ToShortString()
         {
-            return $"Equipped items count: {EquippedItems.Count}\n" +
-                $"Base pieces count: {BasePieces.Count}\n" +
-                $"Vehicles count: {Vehicles.Count}\n" +
-                $"Inventory items count: {InventoryItems.Count}";
+            return $"Equipped items count: {EquippedItems.Count}\n, Base pieces count: {BasePieces.Count}\n, Vehicles count: {Vehicles.Count}\n, Inventory items count: {InventoryItems.Count}";
         }
     }
 }
diff --git a/NitroxModel/Server/ServerConfig.cs b/NitroxModel/Server/ServerConfig.cs
@@ -7,9 +7,10 @@ namespace NitroxModel.Server
 {
     public class ServerConfig
     {
+        private readonly ServerConfigItem<ServerGameMode> gameModeSetting;
         private readonly ServerConfigItem<bool> disableConsoleSetting, disableAutoSaveSetting;
         private readonly ServerConfigItem<int> portSetting, saveIntervalSetting, maxConnectionsSetting;
-        private readonly ServerConfigItem<string> saveNameSetting, serverPasswordSetting, adminPasswordSetting, gameModeSetting, serverSerializerMode;
+        private readonly ServerConfigItem<string> saveNameSetting, serverPasswordSetting, adminPasswordSetting, serverSerializerMode;
         private readonly ServerConfigItem<float> oxygenSetting, maxOxygenSetting, healthSetting, foodSetting, waterSetting, infectionSetting;
 
         public ServerConfig() : this(
@@ -21,12 +22,12 @@ public ServerConfig() : this(
                savename: "world",
                serverpassword: string.Empty,
                adminpassword: StringHelper.GenerateRandomString(12),
-               gamemodeSetting: ServerGameMode.SURVIVAL,
+               gamemode: ServerGameMode.SURVIVAL,
                serverserializermode: ServerSerializerMode.PROTOBUF
         )
         { }
 
-        public ServerConfig(int port, int saveinterval, int maxconnection, bool disableconsole, bool disableautosave, string savename, string serverpassword, string adminpassword, ServerGameMode gamemodeSetting, ServerSerializerMode serverserializermode)
+        public ServerConfig(int port, int saveinterval, int maxconnection, bool disableconsole, bool disableautosave, string savename, string serverpassword, string adminpassword, ServerGameMode gamemode, ServerSerializerMode serverserializermode)
         {
             portSetting = new ServerConfigItem<int>("Port", port);
             saveIntervalSetting = new ServerConfigItem<int>("SaveInterval", saveinterval);
@@ -36,7 +37,7 @@ public ServerConfig(int port, int saveinterval, int maxconnection, bool disablec
             saveNameSetting = new ServerConfigItem<string>("SaveName", savename);
             serverPasswordSetting = new ServerConfigItem<string>("ServerPassword", serverpassword);
             adminPasswordSetting = new ServerConfigItem<string>("AdminPassword", adminpassword);
-            gameModeSetting = new ServerConfigItem<string>("GameMode", gamemodeSetting.GetAttribute<DescriptionAttribute>().Description);
+            gameModeSetting = new ServerConfigItem<ServerGameMode>("GameMode", gamemode);
             serverSerializerMode = new ServerConfigItem<string>("ServerSerializerMode", serverserializermode.ToString());
 
             //We don't want to custom those values for now
@@ -159,7 +160,7 @@ public string AdminPassword
             }
         }
 
-        public string GameMode
+        public ServerGameMode GameModeEnum
         {
             get
             {
@@ -168,20 +169,10 @@ public string GameMode
 
             set
             {
-                Validate.IsFalse(string.IsNullOrWhiteSpace(value), "Gamemode can't be an empty string");
-                Validate.IsTrue(Enum.IsDefined(typeof(ServerGameMode), value.ToUpper()), "Gamemode doesn't exists");
                 gameModeSetting.Value = value;
             }
         }
 
-        public ServerGameMode GameModeEnum
-        {
-            set
-            {
-                GameMode = value.GetAttribute<DescriptionAttribute>().Description.ToString();
-            }
-        }
-
         public ServerSerializerMode SerializerModeEnum
         {
             get
@@ -200,9 +191,6 @@ public ServerSerializerMode SerializerModeEnum
         public PlayerStatsData DefaultPlayerStats => new PlayerStatsData(oxygenSetting.Value, maxOxygenSetting.Value, healthSetting.Value, foodSetting.Value, waterSetting.Value, infectionSetting.Value);
         #endregion
 
-        public bool IsGameMode(string gamemode)
-        {
-            return GameMode == gamemode;
-        }
+        public bool IsHardcore => GameModeEnum == ServerGameMode.HARDCORE;
     }
 }
diff --git a/NitroxModel/Server/ServerConfigItem.cs b/NitroxModel/Server/ServerConfigItem.cs
@@ -56,11 +56,10 @@ public ServerConfigItem(string itemName, T defaultValue)
                     return;
                 }
 
-                // Enum members are assumed to be Titlecased
+                // Enum members are assumed to be uppercased
                 if (typeof(T).IsEnum)
                 {
-                    text = text.ToLower();
-                    text = char.ToUpper(text[0]) + text.Substring(1);
+                    text = text.ToUpper();
                 }
 
                 value = (T)converter.ConvertFromString(text);
diff --git a/NitroxModel/Server/ServerGameMode.cs b/NitroxModel/Server/ServerGameMode.cs
@@ -1,16 +1,10 @@
-﻿using System.ComponentModel;
-
-namespace NitroxModel.Server
+﻿namespace NitroxModel.Server
 {
     public enum ServerGameMode
     {
-        [Description("Survival")]
         SURVIVAL = 0,
-        [Description("Freedom")]
         FREEDOM = 2,
-        [Description("Hardcore")]
         HARDCORE = 257,
-        [Description("Creative")]
         CREATIVE = 1790,
     }
 }
diff --git a/NitroxServer-Subnautica/App.config b/NitroxServer-Subnautica/App.config
@@ -4,7 +4,7 @@
         <add key="MaxConnections" value="100" />
         <add key="Port" value="11000" />
         <add key="SaveInterval" value="120000" />
-        <add key="GameMode" value="Survival" />
+        <add key="GameMode" value="SURVIVAL" />
         <add key="SaveFileSerializer" value="PROTOBUF" />
         <add key="DisableConsole" value="false" />
         <add key="DisableAutoSave" value="false" />
diff --git a/NitroxServer-Subnautica/Program.cs b/NitroxServer-Subnautica/Program.cs
@@ -57,7 +57,7 @@ private static void Main(string[] args)
             try
             {
                 server = NitroxServiceLocator.LocateService<Server>();
-                Log.Info($"Loaded save\n{server.SaveSummary}");
+
                 if (!server.Start())
                 {
                     Log.Error("Unable to start server.");
diff --git a/NitroxServer/Communication/Packets/Processors/PlayerDeathEventProcessor.cs b/NitroxServer/Communication/Packets/Processors/PlayerDeathEventProcessor.cs
@@ -18,7 +18,7 @@ public PlayerDeathEventProcessor(PlayerManager playerManager, ServerConfig serve
 
         public override void Process(PlayerDeathEvent packet, Player player)
         {
-            if(serverConfig.IsGameMode("Hardcore"))
+            if(serverConfig.IsHardcore)
             {
                 player.IsPermaDeath = true;
                 PlayerKicked playerKicked = new PlayerKicked("Permanent death from hardcore mode");
diff --git a/NitroxServer/GameLogic/PlayerManager.cs b/NitroxServer/GameLogic/PlayerManager.cs
@@ -66,7 +66,7 @@ public MultiplayerSessionReservation ReservePlayerContext(
             string playerName = authenticationContext.Username;
             Player player;
             allPlayersByName.TryGetValue(playerName, out player);
-            if ((player?.IsPermaDeath == true) && serverConfig.IsGameMode("Hardcore"))
+            if ((player?.IsPermaDeath == true) && serverConfig.IsHardcore)
             {
                 MultiplayerSessionReservationState rejectedState = MultiplayerSessionReservationState.REJECTED | MultiplayerSessionReservationState.HARDCORE_PLAYER_DEAD;
                 return new MultiplayerSessionReservation(correlationId, rejectedState);
diff --git a/NitroxServer/Serialization/World/World.cs b/NitroxServer/Serialization/World/World.cs
@@ -1,4 +1,5 @@
-﻿using NitroxServer.GameLogic;
+﻿using NitroxModel.Server;
+using NitroxServer.GameLogic;
 using NitroxServer.GameLogic.Bases;
 using NitroxServer.GameLogic.Entities;
 using NitroxServer.GameLogic.Entities.Spawning;
@@ -21,6 +22,6 @@ public class World
         public VehicleManager VehicleManager { get; set; }
         public InventoryManager InventoryManager { get; set; }
         public GameData GameData { get; set; }
-        public string GameMode { get; set; }
+        public ServerGameMode GameMode { get; set; }
     }
 }
diff --git a/NitroxServer/Serialization/World/WorldPersistence.cs b/NitroxServer/Serialization/World/WorldPersistence.cs
@@ -36,7 +36,6 @@ public WorldPersistence(ServerProtoBufSerializer protoBufSerializer, ServerJsonS
             this.protoBufSerializer = protoBufSerializer;
             this.config = config;
 
-            Log.Info($"Using {config.SerializerModeEnum} as save file serializer");
             saveDataSerializer = config.SerializerModeEnum == ServerSerializerMode.PROTOBUF ? (IServerSerializer)protoBufSerializer : jsonSerializer;
             fileEnding = config.SerializerModeEnum == ServerSerializerMode.PROTOBUF ? ".nitrox" : ".json";
         }
@@ -137,7 +136,7 @@ private Optional<World> LoadFromFile(string saveDir)
                                           persistedData.WorldData.ParsedBatchCells,
                                           persistedData.WorldData.EscapePodData.EscapePods,
                                           persistedData.WorldData.StoryTimingData,
-                                          config.GameMode);
+                                          config.GameModeEnum);
 
                 return Optional.Of(world);
             }
@@ -185,7 +184,8 @@ private World CreateFreshWorld()
                 new List<VehicleModel>(), new List<Player>(), new List<ItemData>(),
                 new List<ItemData>(),
                 new GameData() { PDAState = new PDAStateData(), StoryGoals = new StoryGoalData() },
-                new List<Int3>(), new List<EscapePodModel>(), new StoryTimingData(), config.GameMode);
+                new List<Int3>(), new List<EscapePodModel>(), new StoryTimingData(), config.GameModeEnum
+                );
         }
 
         private World CreateWorld(DateTime serverStartTime,
@@ -200,7 +200,7 @@ private World CreateWorld(DateTime serverStartTime,
                                   List<Int3> parsedBatchCells,
                                   List<EscapePodModel> escapePods,
                                   StoryTimingData storyTimingData,
-                                  string gameMode)
+                                  ServerGameMode gameMode)
         {
             World world = new World();
             world.TimeKeeper = new TimeKeeper();
@@ -216,26 +216,21 @@ private World CreateWorld(DateTime serverStartTime,
             world.EscapePodManager = new EscapePodManager(escapePods);
             world.GameMode = gameMode;
 
-            world.BatchEntitySpawner = new BatchEntitySpawner(NitroxServiceLocator.LocateService<EntitySpawnPointFactory>(),
-                                                              NitroxServiceLocator.LocateService<UweWorldEntityFactory>(),
-                                                              NitroxServiceLocator.LocateService<UwePrefabFactory>(),
-                                                              parsedBatchCells,
-                                                              protoBufSerializer,
-                                                              NitroxServiceLocator.LocateService<Dictionary<NitroxTechType, IEntityBootstrapper>>(),
-                                                              NitroxServiceLocator.LocateService<Dictionary<string, PrefabPlaceholdersGroupAsset>>());
+            world.BatchEntitySpawner = new BatchEntitySpawner(
+                NitroxServiceLocator.LocateService<EntitySpawnPointFactory>(),
+                NitroxServiceLocator.LocateService<UweWorldEntityFactory>(),
+                NitroxServiceLocator.LocateService<UwePrefabFactory>(),
+                parsedBatchCells,
+                protoBufSerializer,
+                NitroxServiceLocator.LocateService<Dictionary<NitroxTechType, IEntityBootstrapper>>(),
+                NitroxServiceLocator.LocateService<Dictionary<string, PrefabPlaceholdersGroupAsset>>()
+            );
 
             world.EntityManager = new EntityManager(entities, world.BatchEntitySpawner);
 
             HashSet<NitroxTechType> serverSpawnedSimulationWhiteList = NitroxServiceLocator.LocateService<HashSet<NitroxTechType>>();
             world.EntitySimulation = new EntitySimulation(world.EntityManager, world.SimulationOwnershipData, world.PlayerManager, serverSpawnedSimulationWhiteList);
 
-            Log.Info($"World GameMode: {gameMode}");
-            Log.InfoSensitive("Server Password: {password}", string.IsNullOrEmpty(config.ServerPassword) ? "None. Public Server." : config.ServerPassword);
-            Log.InfoSensitive("Admin Password: {password}", config.AdminPassword);
-            Log.Info($"Autosave: {(config.DisableAutoSave ? "DISABLED" : $"ENABLED ({config.SaveInterval / 60000} min)")}");
-
-            Log.Info("To get help for commands, run help in console or /help in chatbox");
-
             return world;
         }
     }
diff --git a/NitroxServer/Server.cs b/NitroxServer/Server.cs
@@ -82,7 +82,16 @@ public bool Start()
                 return false;
             }
 
+            Log.Info($"Using {serverConfig.SerializerModeEnum} as save file serializer");
+            Log.InfoSensitive("Server Password: {password}", string.IsNullOrEmpty(serverConfig.ServerPassword) ? "None. Public Server." : serverConfig.ServerPassword);
+            Log.InfoSensitive("Admin Password: {password}", serverConfig.AdminPassword);
+            Log.Info($"Autosave: {(serverConfig.DisableAutoSave ? "DISABLED" : $"ENABLED ({serverConfig.SaveInterval / 60000} min)")}");
+            Log.Info($"World GameMode: {serverConfig.GameModeEnum}");
+
+            Log.Info($"Loaded save\n{SaveSummary}");
+
             Log.Info("Nitrox Server Started");
+            Log.Info("To get help for commands, run help in console or /help in chatbox\n");
 
             if (!serverConfig.DisableAutoSave)
             {

Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,12 @@`
`1`		`-using System;`
`2`		`-using System.Collections;`
	`1`	`+using System.Collections;`
`3`	`2`	`using NitroxClient.Communication.Abstract;`
`4`	`3`	`using NitroxClient.GameLogic.InitialSync.Base;`
`5`	`4`	`using NitroxClient.MonoBehaviours;`
`6`	`5`	`using NitroxModel.DataStructures;`
`7`	`6`	`using NitroxModel.DataStructures.GameLogic;`
`8`	`7`	`using NitroxModel.Logger;`
`9`	`8`	`using NitroxModel.Packets;`
	`9`	`+using NitroxModel.Server;`
`10`	`10`	`using UnityEngine;`
`11`	`11`
`12`	`12`	`namespace NitroxClient.GameLogic.InitialSync`
`@@ -36,15 +36,15 @@ public override IEnumerator Process(InitialPlayerSync packet, WaitScreen.ManualW`
`36`	`36`	`waitScreenItem.SetProgress(0.75f);`
`37`	`37`	`yield return null;`
`38`	`38`
`39`		`- SetPlayerGameMode((GameModeOption)Enum.Parse(typeof(GameModeOption), packet.GameMode));`
	`39`	`+ SetPlayerGameMode(packet.GameMode);`
`40`	`40`	`waitScreenItem.SetProgress(1f);`
`41`	`41`	`yield return null;`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`private void SetPlayerGameObjectId(NitroxId id)`
`45`	`45`	`{`
`46`	`46`	`NitroxEntity.SetNewId(Player.mainObject, id);`
`47`		`- Log.Info("Received initial sync Player GameObject Id: " + id);`
	`47`	`+ Log.Info($"Received initial sync player GameObject Id: {id}");`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`private void AddStartingItemsToPlayer(bool firstTimeConnecting)`
`@@ -81,10 +81,10 @@ private void SetPlayerStats(PlayerStatsData statsData)`
`81`	`81`	`}`
`82`	`82`	`}`
`83`	`83`
`84`		`- private void SetPlayerGameMode(GameModeOption gameMode)`
	`84`	`+ private void SetPlayerGameMode(ServerGameMode gameMode)`
`85`	`85`	`{`
`86`		`- Log.Info("Recieved initial sync packet with game mode " + gameMode);`
`87`		`- GameModeUtils.SetGameMode(gameMode, GameModeOption.None);`
	`86`	`+ Log.Info($"Received initial sync packet with gamemode {gameMode}");`
	`87`	`+ GameModeUtils.SetGameMode((GameModeOption)(int)gameMode, GameModeOption.None);`
`88`	`88`	`}`
`89`	`89`	`}`
`90`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`using NitroxModel.DataStructures;`
`5`	`5`	`using NitroxModel.DataStructures.GameLogic;`
`6`	`6`	`using NitroxModel.DataStructures.Util;`
	`7`	`+using NitroxModel.Server;`
`7`	`8`
`8`	`9`	`namespace NitroxModel.Packets`
`9`	`10`	`{`
`@@ -27,7 +28,7 @@ public class InitialPlayerSync : Packet, IShortString`
`27`	`28`	`public PlayerStatsData PlayerStatsData { get; }`
`28`	`29`	`public List<InitialRemotePlayerData> RemotePlayerData { get; }`
`29`	`30`	`public List<Entity> GlobalRootEntities { get; }`
`30`		`- public string GameMode { get; }`
	`31`	`+ public ServerGameMode GameMode { get; }`
`31`	`32`	`public Perms Permissions { get; }`
`32`	`33`
`33`	`34`	`public InitialPlayerSync(NitroxId playerGameObjectId,`
`@@ -47,7 +48,7 @@ public InitialPlayerSync(NitroxId playerGameObjectId,`
`47`	`48`	`PlayerStatsData playerStatsData,`
`48`	`49`	`IEnumerable<InitialRemotePlayerData> remotePlayerData,`
`49`	`50`	`IEnumerable<Entity> globalRootEntities,`
`50`		`- string gameMode,`
	`51`	`+ ServerGameMode gameMode,`
`51`	`52`	`Perms perms)`
`52`	`53`	`{`
`53`	`54`	`EscapePodsData = escapePodsData.ToList();`
`@@ -73,15 +74,12 @@ public InitialPlayerSync(NitroxId playerGameObjectId,`
`73`	`74`
`74`	`75`	`public override string ToString()`
`75`	`76`	`{`
`76`		`- return "[InitialPlayerSync - EquippedItems: " + EquippedItems + " BasePieces: " + BasePieces + " Vehicles: " + Vehicles + " InventoryItems: " + InventoryItems + " PDAData: " + PDAData + " StoryGoalData: " + StoryGoalData + "]";`
	`77`	`+ return $"[InitialPlayerSync - GameMode: {GameMode}, EquippedItems: {EquippedItems} BasePieces: {BasePieces} Vehicles: {Vehicles} InventoryItems: {InventoryItems} PDAData: {PDAData} StoryGoalData: {StoryGoalData}]";`
`77`	`78`	`}`
`78`	`79`
`79`	`80`	`public string ToShortString()`
`80`	`81`	`{`
`81`		`- return $"Equipped items count: {EquippedItems.Count}\n" +`
`82`		`- $"Base pieces count: {BasePieces.Count}\n" +`
`83`		`- $"Vehicles count: {Vehicles.Count}\n" +`
`84`		`- $"Inventory items count: {InventoryItems.Count}";`
	`82`	`+ return $"Equipped items count: {EquippedItems.Count}\n, Base pieces count: {BasePieces.Count}\n, Vehicles count: {Vehicles.Count}\n, Inventory items count: {InventoryItems.Count}";`
`85`	`83`	`}`
`86`	`84`	`}`
`87`	`85`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,9 +7,10 @@ namespace NitroxModel.Server`
`7`	`7`	`{`
`8`	`8`	`public class ServerConfig`
`9`	`9`	`{`
	`10`	`+ private readonly ServerConfigItem<ServerGameMode> gameModeSetting;`
`10`	`11`	`private readonly ServerConfigItem<bool> disableConsoleSetting, disableAutoSaveSetting;`
`11`	`12`	`private readonly ServerConfigItem<int> portSetting, saveIntervalSetting, maxConnectionsSetting;`
`12`		`- private readonly ServerConfigItem<string> saveNameSetting, serverPasswordSetting, adminPasswordSetting, gameModeSetting, serverSerializerMode;`
	`13`	`+ private readonly ServerConfigItem<string> saveNameSetting, serverPasswordSetting, adminPasswordSetting, serverSerializerMode;`
`13`	`14`	`private readonly ServerConfigItem<float> oxygenSetting, maxOxygenSetting, healthSetting, foodSetting, waterSetting, infectionSetting;`
`14`	`15`
`15`	`16`	`public ServerConfig() : this(`
`@@ -21,12 +22,12 @@ public ServerConfig() : this(`
`21`	`22`	`savename: "world",`
`22`	`23`	`serverpassword: string.Empty,`
`23`	`24`	`adminpassword: StringHelper.GenerateRandomString(12),`
`24`		`- gamemodeSetting: ServerGameMode.SURVIVAL,`
	`25`	`+ gamemode: ServerGameMode.SURVIVAL,`
`25`	`26`	`serverserializermode: ServerSerializerMode.PROTOBUF`
`26`	`27`	`)`
`27`	`28`	`{ }`
`28`	`29`
`29`		`- public ServerConfig(int port, int saveinterval, int maxconnection, bool disableconsole, bool disableautosave, string savename, string serverpassword, string adminpassword, ServerGameMode gamemodeSetting, ServerSerializerMode serverserializermode)`
	`30`	`+ public ServerConfig(int port, int saveinterval, int maxconnection, bool disableconsole, bool disableautosave, string savename, string serverpassword, string adminpassword, ServerGameMode gamemode, ServerSerializerMode serverserializermode)`
`30`	`31`	`{`
`31`	`32`	`portSetting = new ServerConfigItem<int>("Port", port);`
`32`	`33`	`saveIntervalSetting = new ServerConfigItem<int>("SaveInterval", saveinterval);`
`@@ -36,7 +37,7 @@ public ServerConfig(int port, int saveinterval, int maxconnection, bool disablec`
`36`	`37`	`saveNameSetting = new ServerConfigItem<string>("SaveName", savename);`
`37`	`38`	`serverPasswordSetting = new ServerConfigItem<string>("ServerPassword", serverpassword);`
`38`	`39`	`adminPasswordSetting = new ServerConfigItem<string>("AdminPassword", adminpassword);`
`39`		`- gameModeSetting = new ServerConfigItem<string>("GameMode", gamemodeSetting.GetAttribute<DescriptionAttribute>().Description);`
	`40`	`+ gameModeSetting = new ServerConfigItem<ServerGameMode>("GameMode", gamemode);`
`40`	`41`	`serverSerializerMode = new ServerConfigItem<string>("ServerSerializerMode", serverserializermode.ToString());`
`41`	`42`
`42`	`43`	`//We don't want to custom those values for now`
`@@ -159,7 +160,7 @@ public string AdminPassword`
`159`	`160`	`}`
`160`	`161`	`}`
`161`	`162`
`162`		`- public string GameMode`
	`163`	`+ public ServerGameMode GameModeEnum`
`163`	`164`	`{`
`164`	`165`	`get`
`165`	`166`	`{`
`@@ -168,20 +169,10 @@ public string GameMode`
`168`	`169`
`169`	`170`	`set`
`170`	`171`	`{`
`171`		`- Validate.IsFalse(string.IsNullOrWhiteSpace(value), "Gamemode can't be an empty string");`
`172`		`- Validate.IsTrue(Enum.IsDefined(typeof(ServerGameMode), value.ToUpper()), "Gamemode doesn't exists");`
`173`	`172`	`gameModeSetting.Value = value;`
`174`	`173`	`}`
`175`	`174`	`}`
`176`	`175`
`177`		`- public ServerGameMode GameModeEnum`
`178`		`- {`
`179`		`- set`
`180`		`- {`
`181`		`- GameMode = value.GetAttribute<DescriptionAttribute>().Description.ToString();`
`182`		`- }`
`183`		`- }`
`184`		`-`
`185`	`176`	`public ServerSerializerMode SerializerModeEnum`
`186`	`177`	`{`
`187`	`178`	`get`
`@@ -200,9 +191,6 @@ public ServerSerializerMode SerializerModeEnum`
`200`	`191`	`public PlayerStatsData DefaultPlayerStats => new PlayerStatsData(oxygenSetting.Value, maxOxygenSetting.Value, healthSetting.Value, foodSetting.Value, waterSetting.Value, infectionSetting.Value);`
`201`	`192`	`#endregion`
`202`	`193`
`203`		`- public bool IsGameMode(string gamemode)`
`204`		`- {`
`205`		`- return GameMode == gamemode;`
`206`		`- }`
	`194`	`+ public bool IsHardcore => GameModeEnum == ServerGameMode.HARDCORE;`
`207`	`195`	`}`
`208`	`196`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,11 +56,10 @@ public ServerConfigItem(string itemName, T defaultValue)`
`56`	`56`	`return;`
`57`	`57`	`}`
`58`	`58`
`59`		`- // Enum members are assumed to be Titlecased`
	`59`	`+ // Enum members are assumed to be uppercased`
`60`	`60`	`if (typeof(T).IsEnum)`
`61`	`61`	`{`
`62`		`- text = text.ToLower();`
`63`		`- text = char.ToUpper(text[0]) + text.Substring(1);`
	`62`	`+ text = text.ToUpper();`
`64`	`63`	`}`
`65`	`64`
`66`	`65`	`value = (T)converter.ConvertFromString(text);`
Original file line number	Diff line number	Diff line change
`@@ -1,16 +1,10 @@`
`1`		`-using System.ComponentModel;`
`2`		`-`
`3`		`-namespace NitroxModel.Server`
	`1`	`+namespace NitroxModel.Server`
`4`	`2`	`{`
`5`	`3`	`public enum ServerGameMode`
`6`	`4`	`{`
`7`		`- [Description("Survival")]`
`8`	`5`	`SURVIVAL = 0,`
`9`		`- [Description("Freedom")]`
`10`	`6`	`FREEDOM = 2,`
`11`		`- [Description("Hardcore")]`
`12`	`7`	`HARDCORE = 257,`
`13`		`- [Description("Creative")]`
`14`	`8`	`CREATIVE = 1790,`
`15`	`9`	`}`
`16`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ private static void Main(string[] args)`
`57`	`57`	`try`
`58`	`58`	`{`
`59`	`59`	`server = NitroxServiceLocator.LocateService<Server>();`
`60`		`- Log.Info($"Loaded save\n{server.SaveSummary}");`
	`60`	`+`
`61`	`61`	`if (!server.Start())`
`62`	`62`	`{`
`63`	`63`	`Log.Error("Unable to start server.");`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public PlayerDeathEventProcessor(PlayerManager playerManager, ServerConfig serve`
`18`	`18`
`19`	`19`	`public override void Process(PlayerDeathEvent packet, Player player)`
`20`	`20`	`{`
`21`		`- if(serverConfig.IsGameMode("Hardcore"))`
	`21`	`+ if(serverConfig.IsHardcore)`
`22`	`22`	`{`
`23`	`23`	`player.IsPermaDeath = true;`
`24`	`24`	`PlayerKicked playerKicked = new PlayerKicked("Permanent death from hardcore mode");`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public MultiplayerSessionReservation ReservePlayerContext(`
`66`	`66`	`string playerName = authenticationContext.Username;`
`67`	`67`	`Player player;`
`68`	`68`	`allPlayersByName.TryGetValue(playerName, out player);`
`69`		`- if ((player?.IsPermaDeath == true) && serverConfig.IsGameMode("Hardcore"))`
	`69`	`+ if ((player?.IsPermaDeath == true) && serverConfig.IsHardcore)`
`70`	`70`	`{`
`71`	`71`	`MultiplayerSessionReservationState rejectedState = MultiplayerSessionReservationState.REJECTED \| MultiplayerSessionReservationState.HARDCORE_PLAYER_DEAD;`
`72`	`72`	`return new MultiplayerSessionReservation(correlationId, rejectedState);`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`		`-using NitroxServer.GameLogic;`
	`1`	`+using NitroxModel.Server;`
	`2`	`+using NitroxServer.GameLogic;`
`2`	`3`	`using NitroxServer.GameLogic.Bases;`
`3`	`4`	`using NitroxServer.GameLogic.Entities;`
`4`	`5`	`using NitroxServer.GameLogic.Entities.Spawning;`
`@@ -21,6 +22,6 @@ public class World`
`21`	`22`	`public VehicleManager VehicleManager { get; set; }`
`22`	`23`	`public InventoryManager InventoryManager { get; set; }`
`23`	`24`	`public GameData GameData { get; set; }`
`24`		`- public string GameMode { get; set; }`
	`25`	`+ public ServerGameMode GameMode { get; set; }`
`25`	`26`	`}`
`26`	`27`	`}`