diff options
| author | p-mcgowan <mickeymcgowan@shaw.ca> | 2014-12-05 20:24:09 +0100 |
|---|---|---|
| committer | p-mcgowan <mickeymcgowan@shaw.ca> | 2014-12-05 20:24:09 +0100 |
| commit | a8bbd5efe422dd20a6bdcfc18cd0befbfeb93f9d (patch) | |
| tree | 8c1fa6af38d8997f0cc935b62362245373b5db86 /src/Bindings/PluginManager.cpp | |
| parent | reformat (diff) | |
| parent | CheckBasicStyle: Check missing braces for control statements. (diff) | |
| download | cuberite-a8bbd5efe422dd20a6bdcfc18cd0befbfeb93f9d.tar cuberite-a8bbd5efe422dd20a6bdcfc18cd0befbfeb93f9d.tar.gz cuberite-a8bbd5efe422dd20a6bdcfc18cd0befbfeb93f9d.tar.bz2 cuberite-a8bbd5efe422dd20a6bdcfc18cd0befbfeb93f9d.tar.lz cuberite-a8bbd5efe422dd20a6bdcfc18cd0befbfeb93f9d.tar.xz cuberite-a8bbd5efe422dd20a6bdcfc18cd0befbfeb93f9d.tar.zst cuberite-a8bbd5efe422dd20a6bdcfc18cd0befbfeb93f9d.zip | |
Diffstat (limited to 'src/Bindings/PluginManager.cpp')
| -rw-r--r-- | src/Bindings/PluginManager.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/Bindings/PluginManager.cpp b/src/Bindings/PluginManager.cpp index f63578885..406a540f4 100644 --- a/src/Bindings/PluginManager.cpp +++ b/src/Bindings/PluginManager.cpp @@ -448,7 +448,7 @@ bool cPluginManager::CallHookCollectingPickup(cPlayer & a_Player, cPickup & a_Pi -bool cPluginManager::CallHookCraftingNoRecipe(cPlayer & a_Player, cCraftingGrid & a_Grid, cCraftingRecipe * a_Recipe) +bool cPluginManager::CallHookCraftingNoRecipe(cPlayer & a_Player, cCraftingGrid & a_Grid, cCraftingRecipe & a_Recipe) { FIND_HOOK(HOOK_CRAFTING_NO_RECIPE); VERIFY_HOOK; @@ -1459,11 +1459,16 @@ cPluginManager::CommandResult cPluginManager::HandleCommand(cPlayer & a_Player, -cPlugin * cPluginManager::GetPlugin( const AString & a_Plugin) const +cPlugin * cPluginManager::GetPlugin(const AString & a_Plugin) const { for (PluginMap::const_iterator itr = m_Plugins.begin(); itr != m_Plugins.end(); ++itr) { - if (itr->second == nullptr) continue; + if (itr->second == nullptr) + { + // The plugin is currently unloaded + continue; + } + if (itr->second->GetName().compare(a_Plugin) == 0) { return itr->second; |