Split the plugin names and plugin folders to avoid confusing them.
Ref.: http://forum.mc-server.org/showthread.php?tid=1877
This commit is contained in:
@@ -464,22 +464,11 @@ void cServer::ExecuteConsoleCommand(const AString & a_Cmd, cCommandOutputCallbac
|
||||
{
|
||||
if (split.size() > 1)
|
||||
{
|
||||
cPluginManager::PluginMap map = cPluginManager::Get()->GetAllPlugins();
|
||||
|
||||
for (auto plugin_entry : map)
|
||||
{
|
||||
if (plugin_entry.first == split[1])
|
||||
{
|
||||
a_Output.Out("Error! Plugin is already loaded!");
|
||||
a_Output.Finished();
|
||||
return;
|
||||
}
|
||||
}
|
||||
a_Output.Out(cPluginManager::Get()->LoadPlugin(split[1]) ? "Plugin loaded" : "Error occurred loading plugin");
|
||||
}
|
||||
else
|
||||
{
|
||||
a_Output.Out("Usage: load <pluginname>");
|
||||
a_Output.Out("Usage: load <PluginFolder>");
|
||||
}
|
||||
a_Output.Finished();
|
||||
return;
|
||||
@@ -488,12 +477,12 @@ void cServer::ExecuteConsoleCommand(const AString & a_Cmd, cCommandOutputCallbac
|
||||
{
|
||||
if (split.size() > 1)
|
||||
{
|
||||
cPluginManager::Get()->RemovePlugin(cPluginManager::Get()->GetPlugin(split[1]));
|
||||
a_Output.Out("Plugin unloaded");
|
||||
cPluginManager::Get()->UnloadPlugin(split[1]);
|
||||
a_Output.Out("Plugin unload scheduled");
|
||||
}
|
||||
else
|
||||
{
|
||||
a_Output.Out("Usage: unload <pluginname>");
|
||||
a_Output.Out("Usage: unload <PluginFolder>");
|
||||
}
|
||||
a_Output.Finished();
|
||||
return;
|
||||
|
||||
Reference in New Issue
Block a user