summaryrefslogtreecommitdiffstats
path: root/src/Bindings
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2014-02-09 01:14:42 +0100
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2014-02-09 01:14:42 +0100
commit9d1c9097e3a62f11cce94d1807c16a310eba6c2c (patch)
treef186174dd8567c9f0d43969a19782d8fdb2fb2ed /src/Bindings
parentMerge branch 'master' into playerimprovements (diff)
parentMerge pull request #656 from mc-server/ReloadGroups (diff)
downloadcuberite-9d1c9097e3a62f11cce94d1807c16a310eba6c2c.tar
cuberite-9d1c9097e3a62f11cce94d1807c16a310eba6c2c.tar.gz
cuberite-9d1c9097e3a62f11cce94d1807c16a310eba6c2c.tar.bz2
cuberite-9d1c9097e3a62f11cce94d1807c16a310eba6c2c.tar.lz
cuberite-9d1c9097e3a62f11cce94d1807c16a310eba6c2c.tar.xz
cuberite-9d1c9097e3a62f11cce94d1807c16a310eba6c2c.tar.zst
cuberite-9d1c9097e3a62f11cce94d1807c16a310eba6c2c.zip
Diffstat (limited to 'src/Bindings')
-rw-r--r--src/Bindings/ManualBindings.cpp17
1 files changed, 16 insertions, 1 deletions
diff --git a/src/Bindings/ManualBindings.cpp b/src/Bindings/ManualBindings.cpp
index 9ebdc4b22..841ec5cf2 100644
--- a/src/Bindings/ManualBindings.cpp
+++ b/src/Bindings/ManualBindings.cpp
@@ -906,8 +906,12 @@ static int tolua_cWorld_TryGetHeight(lua_State * tolua_S)
{
int Height = 0;
bool res = self->TryGetHeight(BlockX, BlockZ, Height);
- tolua_pushnumber(tolua_S, Height);
tolua_pushboolean(tolua_S, res ? 1 : 0);
+ if (res)
+ {
+ tolua_pushnumber(tolua_S, Height);
+ return 2;
+ }
}
}
return 1;
@@ -1106,6 +1110,16 @@ static int tolua_cPluginManager_GetCurrentPlugin(lua_State * S)
+static int tolua_cPluginManager_LogStackTrace(lua_State * S)
+{
+ cLuaState::LogStackTrace(S);
+ return 0;
+}
+
+
+
+
+
static int tolua_cPluginManager_AddHook_FnRef(cPluginManager * a_PluginManager, cLuaState & S, int a_ParamIdx)
{
// Helper function for cPluginmanager:AddHook() binding
@@ -2386,6 +2400,7 @@ void ManualBindings::Bind(lua_State * tolua_S)
tolua_function(tolua_S, "ForEachConsoleCommand", tolua_cPluginManager_ForEachConsoleCommand);
tolua_function(tolua_S, "GetAllPlugins", tolua_cPluginManager_GetAllPlugins);
tolua_function(tolua_S, "GetCurrentPlugin", tolua_cPluginManager_GetCurrentPlugin);
+ tolua_function(tolua_S, "LogStackTrace", tolua_cPluginManager_LogStackTrace);
tolua_endmodule(tolua_S);
tolua_beginmodule(tolua_S, "cPlayer");