1.8.1

Notulp · May 10, 2022 · 3f14842 · 3f14842
1 parent 6a2c14d
commit 3f14842
Show file tree

Hide file tree

Showing 53 changed files with 175 additions and 114 deletions.
diff --git a/Fougerite/Fougerite/Bootstrap.cs b/Fougerite/Fougerite/Bootstrap.cs
@@ -16,7 +16,7 @@ public class Bootstrap : Facepunch.MonoBehaviour
         /// <summary>
         /// Returns the Current Fougerite Version
         /// </summary>
-        public const string Version = "1.8.0";
+        public const string Version = "1.8.1";
         /// <summary>
         /// This value decides wheather we should remove the player classes from the cache upon disconnect.
         /// </summary>

diff --git a/Fougerite/Fougerite/PluginLoaders/BasePlugin.cs b/Fougerite/Fougerite/PluginLoaders/BasePlugin.cs
@@ -54,6 +54,12 @@ public class BasePlugin : CountedInstance, IPlugin
         /// </summary>
         /// <value>The globals.</value>
         public IList<string> Globals { get; protected set; }
+
+        /// <summary>
+        /// Global methods of the plugin along with their functions.
+        /// </summary>
+        /// <value>The globals.</value>
+        public Dictionary<string, object> CachedGlobals { get; protected set; }
 
         /// <summary>
         /// Dictionary that holds the timers.
@@ -96,6 +102,7 @@ public BasePlugin(string name, DirectoryInfo rootdir)
             Name = name;
             RootDir = rootdir;
             Globals = new List<string>();
+            CachedGlobals = new Dictionary<string, object>();
 
             Timers = new Dictionary<string, TimedEvent>();
             ParallelTimers = new List<TimedEvent>();

diff --git a/Fougerite/Fougerite/PluginLoaders/JavaScriptPlugin.cs b/Fougerite/Fougerite/PluginLoaders/JavaScriptPlugin.cs
@@ -82,9 +82,9 @@ public override void Load(string code = "")
                     .SetFunction("importClass", new importit(importClass));
                 Program = JintEngine.Compile(code, false);
 
-                Globals = (from statement in Program.Statements
-                    where statement.GetType() == typeof(FunctionDeclarationStatement)
-                    select ((FunctionDeclarationStatement) statement).Name).ToList<string>();
+                Globals = (Program.Statements
+                    .Where(statement => statement.GetType() == typeof(FunctionDeclarationStatement))
+                    .Select(statement => ((FunctionDeclarationStatement)statement).Name)).ToList();
 
                 Engine.Run(Program);
 

diff --git a/Fougerite/Fougerite/PluginLoaders/PythonPlugin.cs b/Fougerite/Fougerite/PluginLoaders/PythonPlugin.cs
@@ -4,6 +4,7 @@
 using Fougerite.Caches;
 using Fougerite.Permissions;
 using IronPython.Hosting;
+using Microsoft.Scripting;
 using Microsoft.Scripting.Hosting;
 
 namespace Fougerite.PluginLoaders
@@ -37,7 +38,6 @@ public PythonPlugin(string name, string code, DirectoryInfo rootdir) : base(name
         {
             Type = PluginType.Python;
 
-
             Load(code);
         }
 
@@ -62,13 +62,14 @@ public override object Invoke(string func, params object[] args)
         {
             try
             {
-                if (State == PluginState.Loaded && Globals.Contains(func))
+                object functionToCall = null;
+                if (State == PluginState.Loaded && CachedGlobals.TryGetValue(func, out functionToCall))
                 {
                     object result = null;
 
                     using (new Stopper(Type + " " + Name, func))
                     {
-                        result = Engine.Operations.InvokeMember(Class, func, args);
+                        result = Engine.Operations.Invoke(functionToCall, args);
                     }
 
                     return result;
@@ -113,12 +114,26 @@ public override void Load(string code = "")
             Scope.SetVariable("SQLite", Fougerite.SQLiteConnector.GetInstance);
             Scope.SetVariable("PermissionSystem", PermissionSystem.GetPermissionSystem());
             Scope.SetVariable("PlayerCache", PlayerCache.GetPlayerCache());
-
+            
             try
             {
-                Engine.Execute(code, Scope);
+                ScriptSource source = Engine.CreateScriptSourceFromString(code, Path.GetFileName(RootDir.FullName), SourceCodeKind.Statements);
+                CompiledCode compiled = source.Compile();
+                compiled.Execute(Scope);
+
                 Class = Engine.Operations.Invoke(Scope.GetVariable(Name));
                 Globals = Engine.Operations.GetMemberNames(Class);
+
+                foreach (string name in Globals)
+                {
+                    object func;
+                    if (!Engine.Operations.TryGetMember(Class, name, out func) || !Engine.Operations.IsCallable(func))
+                    {
+                        continue;
+                    }
+
+                    CachedGlobals.Add(name, func);
+                }
 
                 object author = GetGlobalObject("__author__");
                 object about = GetGlobalObject("__about__");

diff --git a/Fougerite/Fougerite/PluginLoaders/PythonPluginLoader.cs b/Fougerite/Fougerite/PluginLoaders/PythonPluginLoader.cs
@@ -139,7 +139,7 @@ public void UnloadPlugin(string name)
 
                 PythonPlugin pythonPlugin = (PythonPlugin) plugin;
 
-                if (plugin.Globals.Contains("On_PluginDeinit"))
+                if (plugin.CachedGlobals.ContainsKey("On_PluginDeinit"))
                     plugin.Invoke("On_PluginDeinit");
 
                 plugin.KillTimers();

diff --git a/Fougerite/Fougerite/Server.cs b/Fougerite/Fougerite/Server.cs
@@ -29,7 +29,7 @@ public class Server
         /// PlayersCache or GetCachePlayer() if you need to use this.
         /// (We also can't change this to a ConcurrentDictionary because other old plugins may depend on this)
         /// </summary>
-        public static Dictionary<ulong, Player> Cache = new Dictionary<ulong, Player>();
+        public static IDictionary<ulong, Player> Cache = new Dictionary<ulong, Fougerite.Player>();
         public static IEnumerable<string> ForceCallForCommands = new List<string>();
 
 

diff --git a/Fougerite/Fougerite/Sleeper.cs b/Fougerite/Fougerite/Sleeper.cs
@@ -1,4 +1,6 @@
 
+using Fougerite.Caches;
+
 namespace Fougerite
 {
     using UnityEngine;
@@ -18,7 +20,9 @@ public Sleeper(DeployableObject obj)
             this._sleeper = obj;
             this._instanceid = this._sleeper.GetInstanceID();
             this._uid = this._sleeper.ownerID;
-            this._name = Fougerite.Server.Cache.ContainsKey(UID) ? Fougerite.Server.Cache[UID].Name : this._sleeper.ownerName;
+            CachedPlayer cachedPlayer;
+            bool success = PlayerCache.GetPlayerCache().CachedPlayers.TryGetValue(UID, out cachedPlayer);
+            this._name = success ? cachedPlayer.Name : this._sleeper.ownerName;
         }
 
         /// <summary>

diff --git a/Fougerite/References/FougeriteExtraReferences/RustPP.dll b/Fougerite/References/FougeriteExtraReferences/RustPP.dll
diff --git a/RustPP/Commands/AboutCommand.cs b/RustPP/Commands/AboutCommand.cs
@@ -8,7 +8,7 @@ public class AboutCommand : ChatCommand
     {
         public override void Execute(ref ConsoleSystem.Arg Arguments, ref string[] ChatArguments)
         {
-            var pl = Fougerite.Server.Cache[Arguments.argUser.userID];
+            var pl = Fougerite.Server.GetServer().GetCachePlayer(Arguments.argUser.userID);
             pl.MessageFrom(Core.Name, "Fougerite is currently running Rust++ v" + Core.Version);
             pl.MessageFrom(Core.Name, "Brought to you by xEnt & EquiFox17 & the Fougerite project.");
         }

diff --git a/RustPP/Commands/AddAdminCommand.cs b/RustPP/Commands/AddAdminCommand.cs
@@ -12,7 +12,7 @@ internal class AddAdminCommand : ChatCommand
     {
         public override void Execute(ref ConsoleSystem.Arg Arguments, ref string[] ChatArguments)
         {
-            var pl = Fougerite.Server.Cache[Arguments.argUser.userID];
+            var pl = Fougerite.Server.GetServer().GetCachePlayer(Arguments.argUser.userID);
             string playerName = string.Join(" ", ChatArguments).Trim(new char[] { ' ', '"' });
             if (playerName == string.Empty)
             {
@@ -77,7 +77,7 @@ public override void Execute(ref ConsoleSystem.Arg Arguments, ref string[] ChatA
 
         public void PartialNameNewAdmin(ref ConsoleSystem.Arg Arguments, int id)
         {
-            var pl = Fougerite.Server.Cache[Arguments.argUser.userID];
+            var pl = Server.GetServer().GetCachePlayer(Arguments.argUser.userID);
             if (id == 0)
             {
                 pl.MessageFrom(Core.Name, "Cancelled!");

diff --git a/RustPP/Commands/AddFlagCommand.cs b/RustPP/Commands/AddFlagCommand.cs
@@ -14,7 +14,7 @@ public class AddFlagCommand : ChatCommand
     {
         public override void Execute(ref ConsoleSystem.Arg Arguments, ref string[] ChatArguments)
         {
-            var pl = Fougerite.Server.Cache[Arguments.argUser.userID];
+            var pl = Server.GetServer().GetCachePlayer(Arguments.argUser.userID);
             if (ChatArguments.Length <= 1)
             {
                 pl.MessageFrom(Core.Name, "AddFlag Usage:  /addflag playerName flag1 flag2...");
@@ -117,7 +117,7 @@ public override void Execute(ref ConsoleSystem.Arg Arguments, ref string[] ChatA
 
         public void PartialNameAddFlags(ref ConsoleSystem.Arg Arguments, int id)
         {
-            var pl = Fougerite.Server.Cache[Arguments.argUser.userID];
+            var pl = Server.GetServer().GetCachePlayer(Arguments.argUser.userID);
             if (id == 0)
             {
                 pl.MessageFrom(Core.Name, "Cancelled!");

diff --git a/RustPP/Commands/AddFriendCommand.cs b/RustPP/Commands/AddFriendCommand.cs
@@ -11,7 +11,7 @@ internal class AddFriendCommand : ChatCommand
     {
         public override void Execute(ref ConsoleSystem.Arg Arguments, ref string[] ChatArguments)
         {
-            var pl = Fougerite.Server.Cache[Arguments.argUser.userID];
+            var pl = Server.GetServer().GetCachePlayer(Arguments.argUser.userID);
             string playerName = string.Join(" ", ChatArguments).Trim(new char[] { ' ', '"' });
             if (playerName == string.Empty)
             {
@@ -68,7 +68,7 @@ public override void Execute(ref ConsoleSystem.Arg Arguments, ref string[] ChatA
 
         public void PartialNameAddFriend(ref ConsoleSystem.Arg Arguments, int id)
         {
-            var pl = Fougerite.Server.Cache[Arguments.argUser.userID];
+            var pl = Server.GetServer().GetCachePlayer(Arguments.argUser.userID);
             if (id == 0)
             {
                 pl.MessageFrom(Core.Name, "Cancelled!");

diff --git a/RustPP/Commands/AnnounceCommand.cs b/RustPP/Commands/AnnounceCommand.cs
@@ -8,7 +8,7 @@ public class AnnounceCommand : ChatCommand
     {
         public override void Execute(ref ConsoleSystem.Arg Arguments, ref string[] ChatArguments)
         {
-            var pl = Fougerite.Server.Cache[Arguments.argUser.userID];
+            var pl = Server.GetServer().GetCachePlayer(Arguments.argUser.userID);
             string strText = string.Join(" ", ChatArguments).Trim(new char[] { ' ', '"' });
 
             if (strText == string.Empty)

diff --git a/RustPP/Commands/BanCommand.cs b/RustPP/Commands/BanCommand.cs
@@ -13,7 +13,7 @@ internal class BanCommand : ChatCommand
     {
         public override void Execute(ref ConsoleSystem.Arg Arguments, ref string[] ChatArguments)
         {
-            var pl = Fougerite.Server.Cache[Arguments.argUser.userID];
+            var pl = Server.GetServer().GetCachePlayer(Arguments.argUser.userID);
             string queryName = Arguments.ArgsStr.Trim(new char[] { ' ', '"' });
             if (queryName == string.Empty)
             {
@@ -48,7 +48,7 @@ into matches
 
         public void PartialNameBan(ref ConsoleSystem.Arg Arguments, int id)
         {
-            var pl = Fougerite.Server.Cache[Arguments.argUser.userID];
+            var pl = Server.GetServer().GetCachePlayer(Arguments.argUser.userID);
             if (id == 0)
             {
                 pl.MessageFrom(Core.Name, "Canceled!");

diff --git a/RustPP/Commands/ChatCommand.cs b/RustPP/Commands/ChatCommand.cs
@@ -23,7 +23,7 @@ public static void AddCommand(string cmdString, ChatCommand command)
 
         public static void CallCommand(string cmd, ref ConsoleSystem.Arg arg, ref string[] chatArgs)
         {
-            var pl = Fougerite.Server.Cache[arg.argUser.userID];
+            var pl = Server.GetServer().GetCachePlayer(arg.argUser.userID);
             if (pl.CommandCancelList.Contains(cmd)) { return; }
             foreach (ChatCommand command in classInstances)
             {

diff --git a/RustPP/Commands/FriendsCommand.cs b/RustPP/Commands/FriendsCommand.cs
@@ -29,7 +29,7 @@ public bool ContainsException(ulong id)
 
         public override void Execute(ref ConsoleSystem.Arg Arguments, ref string[] ChatArguments)
         {
-            var pl = Fougerite.Server.Cache[Arguments.argUser.userID];
+            var pl = Server.GetServer().GetCachePlayer(Arguments.argUser.userID);
             if (!friendsLists.ContainsKey(Arguments.argUser.userID))
             {
                 pl.MessageFrom(Core.Name, "You currently have no friend.");

diff --git a/RustPP/Commands/GetFlagsCommand.cs b/RustPP/Commands/GetFlagsCommand.cs
@@ -10,7 +10,7 @@ public class GetFlagsCommand : ChatCommand
     {
         public override void Execute(ref ConsoleSystem.Arg Arguments, ref string[] ChatArguments)
         {
-            var pl = Fougerite.Server.Cache[Arguments.argUser.userID];
+            var pl = Server.GetServer().GetCachePlayer(Arguments.argUser.userID);
             string queryName = Arguments.ArgsStr.Trim(new char[] { ' ', '"' });
 
             string playerName = string.Join(" ", ChatArguments).Trim(new char[] { ' ', '"' });
@@ -88,7 +88,7 @@ into matches
 
         public void PartialNameGetFlags(ref ConsoleSystem.Arg Arguments, int id)
         {
-            var pl = Fougerite.Server.Cache[Arguments.argUser.userID];
+            var pl = Server.GetServer().GetCachePlayer(Arguments.argUser.userID);
             if (id == 0)
             {
                 pl.MessageFrom(Core.Name, "Cancelled!");

diff --git a/RustPP/Commands/GiveItemCommand.cs b/RustPP/Commands/GiveItemCommand.cs
@@ -11,7 +11,7 @@ internal class GiveItemCommand : ChatCommand
     {
         public override void Execute(ref ConsoleSystem.Arg Arguments, ref string[] ChatArguments)
         {
-            var pl = Fougerite.Server.Cache[Arguments.argUser.userID];
+            var pl = Server.GetServer().GetCachePlayer(Arguments.argUser.userID);
             if (pl.CommandCancelList.Contains("give"))
             {
                 return;

diff --git a/RustPP/Commands/GodModeCommand.cs b/RustPP/Commands/GodModeCommand.cs
@@ -10,7 +10,7 @@ public class GodModeCommand : ChatCommand
 
         public override void Execute(ref ConsoleSystem.Arg Arguments, ref string[] ChatArguments)
         {
-            var pl = Fougerite.Server.Cache[Arguments.argUser.userID];
+            var pl = Server.GetServer().GetCachePlayer(Arguments.argUser.userID);
             if (pl.CommandCancelList.Contains("god"))
             {
                 if (userIDs.Contains(pl.UID))

diff --git a/RustPP/Commands/HelpCommand.cs b/RustPP/Commands/HelpCommand.cs
@@ -9,7 +9,7 @@ public class HelpCommand : ChatCommand
     {
         public override void Execute(ref ConsoleSystem.Arg Arguments, ref string[] ChatArguments)
         {
-            var pl = Fougerite.Server.Cache[Arguments.argUser.userID];
+            var pl = Server.GetServer().GetCachePlayer(Arguments.argUser.userID);
             int i = 1;
             string setting = Core.config.GetSetting("Settings", "help_string" + i);
             while (setting != null)

diff --git a/RustPP/Commands/HistoryCommand.cs b/RustPP/Commands/HistoryCommand.cs
@@ -8,7 +8,7 @@ public class HistoryCommand : ChatCommand
     {
         public override void Execute(ref ConsoleSystem.Arg Arguments, ref string[] ChatArguments)
         {
-            var pl = Fougerite.Server.Cache[Arguments.argUser.userID];
+            var pl = Server.GetServer().GetCachePlayer(Arguments.argUser.userID);
             for (int i = 1 + int.Parse(Core.config.GetSetting("Settings", "chat_history_amount")); i > 0; i--)
             {
                 if (Fougerite.Data.GetData().chat_history_username.Count >= i)

diff --git a/RustPP/Commands/InstaKOAllCommand.cs b/RustPP/Commands/InstaKOAllCommand.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using Fougerite;
 using RustPP.Commands;
 
 namespace RustPP
@@ -12,7 +13,7 @@ public class InstaKOAllCommand : ChatCommand
 
         public override void Execute(ref ConsoleSystem.Arg Arguments, ref string[] ChatArguments)
         {
-            var pl = Fougerite.Server.Cache[Arguments.argUser.userID];
+            var pl = Server.GetServer().GetCachePlayer(Arguments.argUser.userID);
             if (pl.CommandCancelList.Contains("instakoall"))
             {
                 if (userIDs.Contains(pl.UID))

diff --git a/RustPP/Commands/InstaKOCommand.cs b/RustPP/Commands/InstaKOCommand.cs
@@ -10,7 +10,7 @@ public class InstaKOCommand : ChatCommand
 
         public override void Execute(ref ConsoleSystem.Arg Arguments, ref string[] ChatArguments)
         {
-            var pl = Fougerite.Server.Cache[Arguments.argUser.userID];
+            var pl = Server.GetServer().GetCachePlayer(Arguments.argUser.userID);
             if (pl.CommandCancelList.Contains("instako"))
             {
                 if (userIDs.Contains(pl.UID))

diff --git a/RustPP/Commands/KickCommand.cs b/RustPP/Commands/KickCommand.cs
@@ -12,7 +12,7 @@ internal class KickCommand : ChatCommand
     {
         public override void Execute(ref ConsoleSystem.Arg Arguments, ref string[] ChatArguments)
         {
-            var pl = Fougerite.Server.Cache[Arguments.argUser.userID];
+            var pl = Server.GetServer().GetCachePlayer(Arguments.argUser.userID);
             string playerName = string.Join(" ", ChatArguments).Trim(new char[] { ' ', '"' });
             if (playerName == string.Empty)
             {
@@ -53,7 +53,7 @@ public override void Execute(ref ConsoleSystem.Arg Arguments, ref string[] ChatA
 
         public void PartialNameKick(ref ConsoleSystem.Arg Arguments, int id)
         {
-            var pl = Fougerite.Server.Cache[Arguments.argUser.userID];
+            var pl = Server.GetServer().GetCachePlayer(Arguments.argUser.userID);
             if (id == 0)
             {
                 pl.MessageFrom(Core.Name, "Cancelled!");

diff --git a/RustPP/Commands/KillCommand.cs b/RustPP/Commands/KillCommand.cs
@@ -12,7 +12,7 @@ internal class KillCommand : ChatCommand
     {
         public override void Execute(ref ConsoleSystem.Arg Arguments, ref string[] ChatArguments)
         {
-            var pl = Fougerite.Server.Cache[Arguments.argUser.userID];
+            var pl = Server.GetServer().GetCachePlayer(Arguments.argUser.userID);
             string playerName = string.Join(" ", ChatArguments).Trim(new char[] { ' ', '"' });
             if (playerName == string.Empty)
             {
@@ -47,7 +47,7 @@ public override void Execute(ref ConsoleSystem.Arg Arguments, ref string[] ChatA
 
         public void PartialNameKill(ref ConsoleSystem.Arg Arguments, int id)
         {
-            var pl = Fougerite.Server.Cache[Arguments.argUser.userID];
+            var pl = Server.GetServer().GetCachePlayer(Arguments.argUser.userID);
             if (id == 0)
             {
                 pl.MessageFrom(Core.Name, "Cancelled!");

diff --git a/RustPP/Commands/LoadoutCommand.cs b/RustPP/Commands/LoadoutCommand.cs
@@ -11,7 +11,7 @@ public override void Execute(ref ConsoleSystem.Arg Arguments, ref string[] ChatA
             int items;
             if (int.TryParse(Core.config.GetSetting("AdminLoadout", "items"), out items))
             {
-                var pl = Fougerite.Server.Cache[Arguments.argUser.userID];
+                var pl = Server.GetServer().GetCachePlayer(Arguments.argUser.userID);
                 for (int i = 1; i <= items; i++)
                 {
                     string name = Core.config.GetSetting("AdminLoadout", "item" + i + "_name");

diff --git a/RustPP/Commands/LocationCommand.cs b/RustPP/Commands/LocationCommand.cs
@@ -8,7 +8,7 @@ public class LocationCommand : ChatCommand
     {
         public override void Execute(ref ConsoleSystem.Arg Arguments, ref string[] ChatArguments)
         {
-            var pl = Fougerite.Server.Cache[Arguments.argUser.userID];
+            var pl = Server.GetServer().GetCachePlayer(Arguments.argUser.userID);
             string targetName = string.Join(" ", ChatArguments).Trim(new char[] { ' ', '"' });
             if (targetName.Equals(string.Empty) || targetName.Equals(Arguments.argUser.displayName))
             {