Merge branch 'master' of https://github.com/TorchAPI/Essentials

Author: Bishbash777

Essentials/Commands/PlayerModule.cs

@@ -178,7 +178,7 @@ public void Unban(string nameOrSteamId)
         [Permission(MyPromoteLevel.None)]
         public void Motd()
         {
-            Plugin.SendMotd((MyPlayer)Context.Player);
+            Plugin.SendMotd((MyPlayer)Context.Player, false);
         }
     }
 }

Essentials/EssentialsConfig.cs

@@ -98,71 +98,6 @@ public int BackpackLimit
         [Display(Visible=false)]
         public ObservableCollection<ulong> KnownSteamIds { get; } = new ObservableCollection<ulong>();
 
-        private bool _packRespawn;
-        [Display(Name = "Pack Respawn", GroupName = "Client Join Tweaks", Order = 1, Description = "Packs ships which the client could respawn at into the initial world send. Will significantly decrease time waiting for ships to sync from the respawn menu, at the cost of slightly increased server load during client join.")]
-        public bool PackRespawn
-        {
-            get => _packRespawn;
-            set => SetValue(ref _packRespawn, value);
-        }
-
-        private int _maxRespawnSize;
-        [Display(Name = "Max Packed Respawn Size", GroupName = "Client Join Tweaks", Order = 2, Description = "Maximum size, in total block count, of ships that can be packed into the world send. Useful if your players often have very large grids. Will slightly lower performance impact of Pack Respawn option, by forcing clients to wait for very large grids the old way.")]
-        public int MaxPackedRespawnSize
-        {
-            get => _maxRespawnSize;
-            set => SetValue(ref _maxRespawnSize, value);
-        }
-
-        private string _loadingText;
-        [Display(Name = "Loading Text", GroupName = "Client Join Tweaks", Order = 3, Description = "Text displayed on the loading screen while the client is joining.")]
-        public string LoadingText
-        {
-            get => _loadingText;
-            set => SetValue(ref _loadingText, string.IsNullOrEmpty(value) ? null : value);
-        }
-
-        private bool _enableClientTweaks = false;
-
-        [Display(Name = "Enable", GroupName = "Client Join Tweaks", Order = 0, Description = "Enables the client join tweak system. None of the options in this section will work if this is unchecked.")]
-        public bool EnableClientTweaks
-        {
-            get => _enableClientTweaks;
-            set => SetValue(ref _enableClientTweaks, value);
-        }
-
-        private bool _enableToolbarOverride;
-        [Display(Name = "Override Default Toolbar", GroupName = "Client Join Tweaks", Order = 4, Description = "Allows you to set a default toolbar for new players on the server. You can set the toolbar ingame with the !admin set toolbar command. This will make your current toolbar the new default.")]
-        public bool EnableToolbarOverride
-        {
-            get => _enableToolbarOverride;
-            set => SetValue(ref _enableToolbarOverride, value);
-        }
-
-        private CompressionLevel _compression = CompressionLevel.Optimal;
-        [Display(Name = "Compression Level", GroupName = "Client Join Tweaks", Order = 5, Description = "Sets the level of compression applied to client data. Higher compression takes more CPU, but less network bandwidth. Recommended to leave this at 'Optimal'")]
-        public CompressionLevel CompressionLevel
-        {
-            get => _compression;
-            set => SetValue(ref _compression, value);
-        }
-
-        private bool _asyncJoin;
-        [Display(Name = "Async Join", GroupName = "Client Join Tweaks", Order = 6, Description = "Speeds up client joining by moving almost all of the logic out of the game thread. Disable this if you get 'CollectionModifiedException'")]
-        public bool AsyncJoin
-        {
-            get => _asyncJoin;
-            set => SetValue(ref _asyncJoin, value);
-        }
-
-        private bool _packPlanets;
-        [Display(Name = "Pack Planets", GroupName = "Client Join Tweaks", Order = 7, Description = "Packs planet data into initial world download. Can speed up spawning in some cases. CAUTION: Planet data is very large! You should use Compression Level 'Optimal' and the Async Join option!")]
-        public bool PackPlanets
-        {
-            get => _packPlanets;
-            set => SetValue(ref _packPlanets, value);
-        }
-
         private bool _cutGameTags;
         [Display(Name = "Cut Game Tags", GroupName = "Client Join Tweaks", Order = 8, Description = "Cuts mods and blocks limits from matchmaking server info. Prevents from 'error downloading session settings'.")]
         public bool CutGameTags

Essentials/EssentialsPlugin.cs

@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Reflection;
+using System.Runtime.Remoting.Contexts;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Controls;
@@ -31,6 +33,8 @@
 using VRage.Game.ModAPI;
 using VRageMath;
 using Newtonsoft.Json;
+using SpaceEngineers.Game.World;
+using VRage.Network;
 
 namespace Essentials
 {
@@ -50,10 +54,13 @@ public class EssentialsPlugin : TorchPluginBase, IWpfPlugin
         private HashSet<ulong> _motdOnce = new HashSet<ulong>();
         private PatchManager _pm;
         private PatchContext _context;
+     
 
         public static EssentialsPlugin Instance { get; private set; }
         public PlayerAccountModule AccModule = new PlayerAccountModule();
         RanksAndPermissionsModule RanksAndPermissions = new RanksAndPermissionsModule();
+        private static bool _initilized = false;
+
 
         /// <inheritdoc />
         public UserControl GetControl() => _control ?? (_control = new PropertyGrid(){DataContext=Config/*, IsEnabled = false*/});
@@ -141,13 +148,25 @@ private void SessionChanged(ITorchSession session, TorchSessionState state)
                                                });
                     AutoCommands.Instance.Start();
                     InfoModule.Init();
+                    _initilized = true;
+
+
                     break;
+
+
                 case TorchSessionState.Unloading:
-                    Log.Info("Unloading rank data into JSON");
-                    RanksAndPermissions.SaveRankData();
-                    mpMan.PlayerLeft -= ResetMotdOnce;
-                    mpMan.PlayerJoined -= MotdOnce;
-                    MyEntities.OnEntityAdd -= EntityAdded;
+
+                    if (_initilized)
+                    {
+                        //Dont try and remove these unless server was actually fully initlized
+                        Log.Info("Unloading rank data into JSON");
+                        RanksAndPermissions.SaveRankData();
+                        mpMan.PlayerLeft -= ResetMotdOnce;
+                        mpMan.PlayerJoined -= MotdOnce;
+                        MyEntities.OnEntityAdd -= EntityAdded;
+                    }
+
+
                     _bagTracker.Clear();
                     _removalTracker.Clear();
                     break;
@@ -261,51 +280,88 @@ private void MotdOnce(IPlayer player)
                                               if (_motdOnce.Contains(player.SteamId))
                                                   return;
 
-                                              SendMotd(p);
+                                              SendMotd(p, true);
                                               _motdOnce.Add(player.SteamId);
                                           });
                              break;
                          }
                      });
         }
 
-        public void SendMotd(MyPlayer player)
+        public void SendMotd(MyPlayer player, bool onSessionChanged)
         {
             long playerId = player.Identity.IdentityId;
 
             if (!string.IsNullOrEmpty(Config.MotdUrl) && !Config.NewUserMotdUrl)
             {
-                if (MyGuiSandbox.IsUrlWhitelisted(Config.MotdUrl))
-                    MyVisualScriptLogicProvider.OpenSteamOverlay(Config.MotdUrl, playerId);
-                else
-                    MyVisualScriptLogicProvider.OpenSteamOverlay($"https://steamcommunity.com/linkfilter/?url={Config.MotdUrl}", playerId);
+                var url = MakeUrl(Config.MotdUrl);
+                MyVisualScriptLogicProvider.OpenSteamOverlay(url, playerId);
+                return;
             }
 
             var id = player.Client.SteamUserId;
-            if (id <= 0) //can't remember if this returns 0 or -1 on error.
-                return;
+            if (id <= 0) return;
 
             string name = player.Identity?.DisplayName ?? "player";
 
-            bool newUser = !Config.KnownSteamIds.Contains(id);
-            if (newUser)
+            bool isNewUser = !Config.KnownSteamIds.Contains(id);
+            if (isNewUser)
+            {
                 Config.KnownSteamIds.Add(id);
-            if (!string.IsNullOrEmpty(Config.MotdUrl) && newUser && Config.NewUserMotdUrl)
+            }
+            
+            if (!string.IsNullOrEmpty(Config.MotdUrl) && isNewUser && Config.NewUserMotdUrl)
+            {
+                var url = MakeUrl(Config.MotdUrl);
+                MyVisualScriptLogicProvider.OpenSteamOverlay(url, playerId);
+                return;
+            }
+
+            if (isNewUser && !string.IsNullOrEmpty(Config.NewUserMotd))
             {
-                if (MyGuiSandbox.IsUrlWhitelisted(Config.MotdUrl))
-                    MyVisualScriptLogicProvider.OpenSteamOverlay(Config.MotdUrl, playerId);
-                else
-                    MyVisualScriptLogicProvider.OpenSteamOverlay($"https://steamcommunity.com/linkfilter/?url={Config.MotdUrl}", playerId);
+                var msg = new DialogMessage(MySession.Static.Name, "New User Message Of The Day", Config.NewUserMotd.Replace("%player%", name));
+                ModCommunication.SendMessageTo(msg, id);
+                return;
             }
 
-            if (newUser && !string.IsNullOrEmpty(Config.NewUserMotd))
+            if (!string.IsNullOrEmpty(Config.Motd))
             {
-                ModCommunication.SendMessageTo(new DialogMessage(MySession.Static.Name, "New User Message Of The Day", Config.NewUserMotd.Replace("%player%", name)), id);
+                var msg = new DialogMessage(MySession.Static.Name, "Message Of The Day", Config.Motd.Replace("%player%", name));
+                ModCommunication.SendMessageTo(msg, id);
+                return;
+            }
 
+            if (!onSessionChanged) // otherwise default motd shows up twice on connection
+            {
+                var txt = GetDefaultMotdText();
+                var msg = new DialogMessage(MySession.Static.Name, "Message Of The Day", txt);
+                ModCommunication.SendMessageTo(msg, id);
+            }
+        }
+
+        static string MakeUrl(string url)
+        {
+            if (MyGuiSandbox.IsUrlWhitelisted(url)) return url;
+            return $"https://steamcommunity.com/linkfilter/?url={url}";
+        }
+
+        static string GetDefaultMotdText()
+        {
+            try
+            {
+                var motdDataStruct = typeof(MySpaceRespawnComponent).GetNestedType("MOTDData", BindingFlags.NonPublic);
+                var motdConstructFunc = motdDataStruct.GetMethod("Construct", BindingFlags.Public | BindingFlags.Static);
+                var motdMessageField = motdDataStruct.GetField("Message", BindingFlags.Public | BindingFlags.Instance);
+                var motd = motdConstructFunc.Invoke(null, new object[0]);
+                var motdMessage = motdMessageField.GetValue(motd) as string;
+                return motdMessage;
             }
-            else if (!string.IsNullOrEmpty(Config.Motd))
+            catch (Exception e)
             {
-                ModCommunication.SendMessageTo(new DialogMessage(MySession.Static.Name, "Message Of The Day", Config.Motd.Replace("%player%", name)), id);
+                var tag = $"#{new Random().NextDouble() * 1000:0}";
+                Log.Info($"Failed to load MotD. Tag: {tag}. Error:");
+                Log.Error(e);
+                return $"Failed to load MotD. Contact admin.\nAdmin: text search in log: {tag}";
             }
         }