Plugins should always load after main level has been loaded

ClassiCube · Jun 7, 2021 · 77a48b5 · 77a48b5
1 parent 522ae80
commit 77a48b5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/MCGalaxy/Levels/LevelConfig.cs b/MCGalaxy/Levels/LevelConfig.cs
@@ -67,22 +67,22 @@ public abstract class EnvConfig {
         [ConfigBoolInt("ExpFog", "Env")]
         public int ExpFog = -1;
 
-        /// <summary> Color of the clouds (RGB packed into an int). Set to -1 to use client defaults. </summary>
+        /// <summary> Color of the clouds (Hex RGB color). Set to -1 to use client defaults. </summary>
         [ConfigString("CloudColor", "Env", "", true)]
         public string CloudColor = "";
-        /// <summary> Color of the fog (RGB packed into an int). Set to -1 to use client defaults. </summary>
+        /// <summary> Color of the fog (Hex RGB color). Set to -1 to use client defaults. </summary>
         [ConfigString("FogColor", "Env", "", true)]
         public string FogColor = "";
-        /// <summary> Color of the sky (RGB packed into an int). Set to -1 to use client defaults. </summary>
+        /// <summary> Color of the sky (Hex RGB color). Set to -1 to use client defaults. </summary>
         [ConfigString("SkyColor", "Env", "", true)]
         public string SkyColor = "";
-        /// <summary> Color of the blocks in shadows (RGB packed into an int). Set to -1 to use client defaults. </summary>
+        /// <summary> Color of the blocks in shadows (Hex RGB color). Set to -1 to use client defaults. </summary>
         [ConfigString("ShadowColor", "Env", "", true)]
         public string ShadowColor = "";
-        /// <summary> Color of the blocks in the light (RGB packed into an int). Set to -1 to use client defaults. </summary>
+        /// <summary> Color of the blocks in the light (Hex RGB color). Set to -1 to use client defaults. </summary>
         [ConfigString("LightColor", "Env", "", true)]
         public string LightColor = "";
-        /// <summary> Color of the skybox (RGB packed into an int). Set to -1 to use client defaults. </summary>
+        /// <summary> Color of the skybox (Hex RGB color). Set to -1 to use client defaults. </summary>
         [ConfigString("SkyboxColor", "Env", "", true)]
         public string SkyboxColor = "";
 

diff --git a/MCGalaxy/Server/Server.Init.cs b/MCGalaxy/Server/Server.Init.cs
@@ -48,6 +48,8 @@ public sealed partial class Server {
             Level.LoadMetadata(mainLevel);
             LevelInfo.Add(mainLevel);
         }
+
+        static void LoadAllPlugins(SchedulerTask task) { Plugin.LoadAll(); }
 
         static void InitPlayerLists(SchedulerTask task) {
             try {

diff --git a/MCGalaxy/Server/Server.cs b/MCGalaxy/Server/Server.cs
@@ -101,7 +101,7 @@ public sealed partial class Server {
             Economy.LoadDatabase();
 
             Background.QueueOnce(LoadMainLevel);
-            Plugin.LoadAll();
+            Background.QueueOnce(LoadAllPlugins);
             Background.QueueOnce(LoadAutoloadMaps);
             Background.QueueOnce(UpgradeTasks.UpgradeOldTempranks);
             Background.QueueOnce(UpgradeTasks.UpgradeDBTimeSpent);