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

Merge pull request #1553 from SphinxC0re/work

Browse Source 
Fix for fix #1552
This commit is contained in:
Alexander Harkness 2014-10-20 15:15:59 +01:00
commit 1f301d7560
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Bindings/PluginManager.cpp
View File

@ -1827,7 +1827,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())
{ {

4
src/Server.cpp
View File

@ -493,9 +493,9 @@ void cServer::ExecuteConsoleCommand(const AString & a_Cmd, cCommandOutputCallbac
{ {
cPluginManager::PluginMap map = cPluginManager::Get()->GetAllPlugins(); cPluginManager::PluginMap map = cPluginManager::Get()->GetAllPlugins();
for(auto plugin_entry : map) for (auto plugin_entry : map)
{ {
if(plugin_entry.first == split[1]) if (plugin_entry.first == split[1])
{ {
a_Output.Out("Error! Plugin is already loaded!"); a_Output.Out("Error! Plugin is already loaded!");
a_Output.Finished(); a_Output.Finished();