AstralTransRocketries/MCGalaxy
1
0
Fork 0
mirror of https://github.com/ClassiCube/MCGalaxy.git synced 2025-09-24 05:03:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix /pload reading plugin dll from root directory instead of plugins sub-folder. (Thanks are)

Browse Source
This commit is contained in:
UnknownShadow200 2016-07-21 23:20:51 +10:00
parent 21faa94cd7
commit 36564b5b4c
3 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Commands/Scripting/CmdPLoad.cs
View File

@ -28,7 +28,7 @@ namespace MCGalaxy.Commands {
public override void Use(Player p, string message) {
if (File.Exists("plugins/" + message + ".dll"))
Plugin.Load(message + ".dll", false);
Plugin.Load(message, false);
else
Player.Message(p, "Plugin not found!");
}

30
Plugins/Manager/Plugin_Manager.cs
View File

@ -90,17 +90,16 @@ namespace MCGalaxy {
#region Loading/Unloading
/// <summary> Load a plugin </summary>
/// <param name="pluginname">The file path of the dll file</param>
/// <param name="name">The name of the plugin.</param>
/// <param name="startup">Is this startup?</param>
public static void Load(string pluginname, bool startup){
public static void Load(string name, bool startup){
string creator = "";
try {
string path = "plugins/" + name + ".dll";
try { throw new Exception();
Plugin instance = null;
Assembly lib = null;
using (FileStream fs = File.Open(pluginname, FileMode.Open))
{
using (MemoryStream ms = new MemoryStream())
{
using (FileStream fs = File.Open(path, FileMode.Open)) {
using (MemoryStream ms = new MemoryStream()) {
byte[] buffer = new byte[1024];
int read = 0;
while ((read = fs.Read(buffer, 0, 1024)) > 0)
@ -122,7 +121,7 @@ namespace MCGalaxy {
catch { }
if (instance == null)
{
Server.s.Log("The plugin " + pluginname + " couldn't be loaded!");
Server.s.Log("The plugin " + name + " couldn't be loaded!");
return;
}
String plugin_version = instance.MCGalaxy_Version;
@ -151,17 +150,17 @@ namespace MCGalaxy {
Server.s.Log(instance.welcome);
return;
} catch (FileNotFoundException) {
Plugin_Simple.Load(pluginname, startup);
Plugin_Simple.Load(name, startup);
} catch (BadImageFormatException) {
Plugin_Simple.Load(pluginname, startup);
Plugin_Simple.Load(name, startup);
} catch (PathTooLongException) {
} catch (FileLoadException) {
Plugin_Simple.Load(pluginname, startup);
Plugin_Simple.Load(name, startup);
} catch (Exception e) {
try { Server.s.Log("Attempting a simple plugin!"); if (Plugin_Simple.Load(pluginname, startup)) return; }
try { Server.s.Log("Attempting a simple plugin!"); if (Plugin_Simple.Load(name, startup)) return; }
catch { }
Server.ErrorLog(e);
Server.s.Log("The plugin " + pluginname + " failed to load!");
Server.s.Log("The plugin " + name + " failed to load!");
if (creator != "")
Server.s.Log("You can go bug " + creator + " about it.");
Thread.Sleep(1000);
@ -192,8 +191,9 @@ namespace MCGalaxy {
/// <summary> Load all plugins </summary>
public static void Load() {
if (Directory.Exists("plugins")) {
foreach (string file in Directory.GetFiles("plugins", "*.dll")) {
Load(file, true);
foreach (string path in Directory.GetFiles("plugins", "*.dll")) {
string name = Path.GetFileNameWithoutExtension(path);
Load(name, true);
}
} else {
Directory.CreateDirectory("plugins");

12
Plugins/Manager/Plugin_Simple.cs
View File

@ -44,15 +44,17 @@ namespace MCGalaxy {
#region Loading
/// <summary> Load a simple plugin </summary>
/// <param name="pluginname">The filepath to load</param>
/// <param name="name">The name of the plugin.</param>
/// <param name="startup">Whether the server is starting up or not</param>
/// <returns>Whether the plugin loaded or not</returns>
public static bool Load(string pluginname, bool startup)
public static bool Load(string name, bool startup)
{
string creator = "";
object instance = null;
Assembly lib = null;
using (FileStream fs = File.Open(pluginname, FileMode.Open))
string path = "plugins/" + name + ".dll";
using (FileStream fs = File.Open(path, FileMode.Open))
{
using (MemoryStream ms = new MemoryStream())
{
@ -64,8 +66,6 @@ namespace MCGalaxy {
ms.Close();
ms.Dispose();
}
fs.Close();
fs.Dispose();
}
try
{
@ -81,7 +81,7 @@ namespace MCGalaxy {
catch { }
if (instance == null)
{
Server.s.Log("The plugin " + pluginname + " couldn't be loaded!");
Server.s.Log("The plugin " + name + " couldn't be loaded!");
return false;
}
String plugin_version = ((Plugin_Simple)instance).MCGalaxy_Version;