Update GitBranch implementation

OxideMod · Sep 12, 2023 · 92b5cd8 · 92b5cd8
1 parent 5272c4d
commit 92b5cd8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/RustCommands.cs b/src/RustCommands.cs
@@ -707,7 +707,7 @@ private void VersionCommand(IPlayer player)
             if (player.IsServer)
             {
                 string format = "Oxide.Rust Version: {0}\nOxide.Rust Branch: {1}";
-                player.Reply(string.Format(format, RustExtension.AssemblyVersion, RustExtension.AssemblyBranch));
+                player.Reply(string.Format(format, RustExtension.AssemblyVersion, Extension.Branch));
             }
             else
             {

diff --git a/src/RustCore.cs b/src/RustCore.cs
@@ -26,9 +26,10 @@ public partial class RustCore : CSPlugin
         public RustCore()
         {
             // Set plugin info attributes
+            Extension = Interface.Oxide.GetExtension<RustExtension>();
             Title = "Rust";
-            Author = RustExtension.AssemblyAuthors;
-            Version = RustExtension.AssemblyVersion;
+            Author = Extension.Author;
+            Version = Extension.Version;
         }
 
         // Libraries
@@ -41,6 +42,7 @@ public RustCore()
         internal static readonly RustCovalenceProvider Covalence = RustCovalenceProvider.Instance;
         internal readonly PluginManager pluginManager = Interface.Oxide.RootPluginManager;
         internal readonly IServer Server = Covalence.CreateServer();
+        internal readonly RustExtension Extension;
 
         // Commands that a plugin can't override
         internal static IEnumerable<string> RestrictedCommands => new[]

diff --git a/src/RustExtension.cs b/src/RustExtension.cs
@@ -19,7 +19,6 @@ public class RustExtension : Extension
         internal static AssemblyName AssemblyName = Assembly.GetName();
         internal static VersionNumber AssemblyVersion = new VersionNumber(AssemblyName.Version.Major, AssemblyName.Version.Minor, AssemblyName.Version.Build);
         internal static string AssemblyAuthors = ((AssemblyCompanyAttribute)Attribute.GetCustomAttribute(Assembly, typeof(AssemblyCompanyAttribute), false)).Company;
-        internal static string AssemblyBranch;
 
         private static readonly WebClient WebClient = new WebClient();
         private static VersionNumber LatestExtVersion = AssemblyVersion;
@@ -106,7 +105,6 @@ public class RustExtension : Extension
         /// <param name="manager"></param>
         public RustExtension(ExtensionManager manager) : base(manager)
         {
-            AssemblyBranch = Branch ?? "master";
         }
 
         /// <summary>