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

Split the plugin names and plugin folders to avoid confusing them.

Browse Source 
Ref.: http://forum.mc-server.org/showthread.php?tid=1877
This commit is contained in:
Mattes D
2015-04-19 10:57:41 +02:00
parent b018079eef
commit a9b5a6c3a6
14 changed files with 714 additions and 1076 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/Bindings/PluginLua.cpp
View File

@@ -93,7 +93,7 @@ void cPluginLua::Close(void)
bool cPluginLua::Initialize(void)
bool cPluginLua::Load(void)
{
cCSLock Lock(m_CriticalSection);
if (!m_LuaState.IsValid())
@@ -144,6 +144,7 @@ bool cPluginLua::Initialize(void)
// Warn if there are no Lua files in the plugin folder:
if (LuaFiles.empty())
{
SetLoadError("No lua files found, plugin is probably missing.");
LOGWARNING("No lua files found: plugin %s is missing.", GetName().c_str());
Close();
return false;
@@ -155,6 +156,7 @@ bool cPluginLua::Initialize(void)
AString Path = PluginPath + *itr;
if (!m_LuaState.LoadFile(Path))
{
SetLoadError(Printf("Failed to load file %s.", itr->c_str()));
Close();
return false;
}
@@ -164,6 +166,8 @@ bool cPluginLua::Initialize(void)
AString Path = PluginPath + "Info.lua";
if (!m_LuaState.LoadFile(Path))
{
SetLoadError("Failed to load file Info.lua.");
m_Status = cPluginManager::psError;
Close();
return false;
}
@@ -173,17 +177,20 @@ bool cPluginLua::Initialize(void)
bool res = false;
if (!m_LuaState.Call("Initialize", this, cLuaState::Return, res))
{
SetLoadError("Cannot call the Initialize() function.");
LOGWARNING("Error in plugin %s: Cannot call the Initialize() function. Plugin is temporarily disabled.", GetName().c_str());
Close();
return false;
}
if (!res)
{
SetLoadError("The Initialize() function failed.");
LOGINFO("Plugin %s: Initialize() call failed, plugin is temporarily disabled.", GetName().c_str());
Close();
return false;
}
m_Status = cPluginManager::psLoaded;
return true;
}
@@ -191,6 +198,16 @@ bool cPluginLua::Initialize(void)
void cPluginLua::Unload(void)
{
super::Unload();
Close();
}
void cPluginLua::OnDisable(void)
{
cCSLock Lock(m_CriticalSection);