Merge pull request #143 from Notulp/dretax

1.7.9C
Notulp · Nov 3, 2020 · 8af1c1c · 8af1c1c
2 parents fe92d87 + f2abae3
commit 8af1c1c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/Fougerite/Fougerite/PluginLoaders/JavaScriptPlugin.cs b/Fougerite/Fougerite/PluginLoaders/JavaScriptPlugin.cs
@@ -1,6 +1,7 @@
 using System;
 using System.IO;
 using System.Linq;
+using Fougerite.Permissions;
 using Jint;
 using Jint.Expressions;
 
@@ -75,6 +76,7 @@ public override void Load(string code = "")
                     .SetParameter("JSON", Fougerite.JsonAPI.GetInstance)
                     .SetParameter("MySQL", Fougerite.MySQLConnector.GetInstance)
                     .SetParameter("SQLite", Fougerite.SQLiteConnector.GetInstance)
+                    .SetParameter("PermissionSystem", PermissionSystem.GetPermissionSystem())
                     .SetFunction("importClass", new importit(importClass));
                 Program = JintEngine.Compile(code, false);
 
@@ -113,7 +115,9 @@ public object GetGlobalObject(string identifier)
         public Jint.Native.JsInstance importClass(string type)
         {
             Engine.SetParameter(type.Split('.').Last(), Util.GetUtil().TryFindReturnType(type));
-            return (Engine.Global as Jint.Native.JsDictionaryObject)[type.Split('.').Last()];
+            Jint.Native.JsDictionaryObject jsobj = (Engine.Global as Jint.Native.JsDictionaryObject);
+
+            return jsobj != null ? jsobj[type.Split('.').Last()] : null;
         }
     }
 }
diff --git a/Fougerite/Fougerite/PluginLoaders/LuaPlugin.cs b/Fougerite/Fougerite/PluginLoaders/LuaPlugin.cs
@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using Fougerite.Permissions;
 using MoonSharp.Interpreter;
 using MoonSharp.Interpreter.Interop;
 
@@ -87,6 +88,7 @@ public override void Load(string code = "")
                 script.Globals.Set("JSON", UserData.Create(JsonAPI.GetInstance));
                 script.Globals.Set("MySQL", UserData.Create(MySQLConnector.GetInstance));
                 script.Globals.Set("SQLite", UserData.Create(Fougerite.SQLiteConnector.GetInstance));
+                script.Globals.Set("PermissionSystem", UserData.Create(PermissionSystem.GetPermissionSystem()));
                 foreach (DynValue v in script.Globals.Keys)
                 {
                     Globals.Add(v.ToString().Replace("\"", ""));

diff --git a/Fougerite/Fougerite/PluginLoaders/PythonPlugin.cs b/Fougerite/Fougerite/PluginLoaders/PythonPlugin.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using Fougerite.Permissions;
 using IronPython.Hosting;
 using Microsoft.Scripting.Hosting;
 
@@ -109,6 +110,7 @@ public override void Load(string code = "")
             Scope.SetVariable("JSON", Fougerite.JsonAPI.GetInstance);
             Scope.SetVariable("MySQL", Fougerite.MySQLConnector.GetInstance);
             Scope.SetVariable("SQLite", Fougerite.SQLiteConnector.GetInstance);
+            Scope.SetVariable("PermissionSystem", PermissionSystem.GetPermissionSystem());
 
             try
             {