From 035cc3da9946cdd5d3f5fe2ef945759c3926a786 Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Thu, 20 Aug 2020 18:14:55 +0200 Subject: [PATCH] Turn DiscordService's 'GetService' into property --- OpenRA.Mods.Common/DiscordService.cs | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/OpenRA.Mods.Common/DiscordService.cs b/OpenRA.Mods.Common/DiscordService.cs index 20789b0b9a..54af65d7bc 100644 --- a/OpenRA.Mods.Common/DiscordService.cs +++ b/OpenRA.Mods.Common/DiscordService.cs @@ -36,16 +36,19 @@ namespace OpenRA.Mods.Common DiscordState currentState; static DiscordService instance; - static DiscordService GetService() + static DiscordService Service { - if (instance != null) + get + { + if (instance != null) + return instance; + + if (!Game.ModData.Manifest.Contains()) + return null; + + instance = Game.ModData.Manifest.Get(); return instance; - - if (!Game.ModData.Manifest.Contains()) - return null; - - instance = Game.ModData.Manifest.Get(); - return instance; + } } public DiscordService(MiniYaml yaml) @@ -178,12 +181,12 @@ namespace OpenRA.Mods.Common public static void UpdateStatus(DiscordState state, string details = null, string secret = null, int? players = null, int? slots = null) { - GetService()?.SetStatus(state, details, secret, players, slots); + Service?.SetStatus(state, details, secret, players, slots); } public static void SetPlayers(int players, int slots) { - GetService()?.client.UpdateParty(new Party + Service?.client.UpdateParty(new Party { ID = Secrets.CreateFriendlySecret(new Random()), Size = players, @@ -193,12 +196,12 @@ namespace OpenRA.Mods.Common public static void UpdatePlayers(int players, int slots) { - GetService()?.client.UpdatePartySize(players, slots); + Service?.client.UpdatePartySize(players, slots); } public static void UpdateDetails(string details) { - GetService()?.client.UpdateDetails(details); + Service?.client.UpdateDetails(details); } } }