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

Added error handling to load <plugin> command

Browse Source
This commit is contained in:
Julian Laubstein 2014-10-20 14:46:24 +02:00
parent 8fbd65e775
commit 1a46feda43
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Bindings/PluginManager.cpp
View File

@ -1525,6 +1525,15 @@ bool cPluginManager::DisablePlugin(const AString & a_PluginName)
bool cPluginManager::LoadPlugin(const AString & a_PluginName) bool cPluginManager::LoadPlugin(const AString & a_PluginName)
{ {
PluginMap map = GetAllPlugins();
for(auto plugin_entry : map)
{
if(plugin_entry.first == a_PluginName)
{
return false;
}
}
return AddPlugin(new cPluginLua(a_PluginName.c_str())); return AddPlugin(new cPluginLua(a_PluginName.c_str()));
} }
@ -1828,6 +1837,7 @@ bool cPluginManager::DoWithPlugin(const AString & a_PluginName, cPluginCallback
bool cPluginManager::AddPlugin(cPlugin * a_Plugin) bool cPluginManager::AddPlugin(cPlugin * a_Plugin)
{ {
m_Plugins[a_Plugin->GetDirectory()] = a_Plugin; m_Plugins[a_Plugin->GetDirectory()] = a_Plugin;
if (a_Plugin->Initialize()) if (a_Plugin->Initialize())
{ {
// Initialization OK // Initialization OK