flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Merge pull request #1552 from SphinxC0re/master

Browse Source 
Added error handling to load <plugin> command
This commit is contained in:
Alexander Harkness 2014-10-20 14:34:19 +01:00
commit bf8de85fd6
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Bindings/PluginManager.cpp
View File

@ -1827,7 +1827,8 @@ bool cPluginManager::DoWithPlugin(const AString & a_PluginName, cPluginCallback
bool cPluginManager::AddPlugin(cPlugin * a_Plugin)
{
m_Plugins[a_Plugin->GetDirectory()] = a_Plugin;
m_Plugins[a_Plugin->GetDirectory()] = a_Plugin;
if (a_Plugin->Initialize())
{
// Initialization OK

11
src/Server.cpp
View File

@ -491,6 +491,17 @@ 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