6 files changed, 9 insertions, 8 deletions

diff --git a/MCServer/Plugins/HookNotify/HookNotify.lua b/MCServer/Plugins/HookNotify/HookNotify.lua
index 5a5a48c72..204f3cb85 100644
--- a/MCServer/Plugins/HookNotify/HookNotify.lua
+++ b/MCServer/Plugins/HookNotify/HookNotify.lua
@@ -30,7 +30,7 @@ function Initialize(Plugin)
 	PluginManager:AddHook(Plugin, cPluginManager.HOOK_PLAYER_MOVED);

 	PluginManager:AddHook(Plugin, cPluginManager.HOOK_PLAYER_PLACED_BLOCK);

 	PluginManager:AddHook(Plugin, cPluginManager.HOOK_PLAYER_PLACING_BLOCK);

-	PluginManager:AddHook(Plugin, cPluginManager.HOOK_PLAYER_RIGHTCLICK);

+	PluginManager:AddHook(Plugin, cPluginManager.HOOK_PLAYER_RIGHT_CLICK);

 	PluginManager:AddHook(Plugin, cPluginManager.HOOK_PLAYER_SHOOTING);

 	PluginManager:AddHook(Plugin, cPluginManager.HOOK_PLAYER_SPAWNED);

 	PluginManager:AddHook(Plugin, cPluginManager.HOOK_PLAYER_TOSSING_ITEM);

diff --git a/source/Bindings.cpp b/source/Bindings.cpp
index 21631e429..70b1e1833 100644
--- a/source/Bindings.cpp
+++ b/source/Bindings.cpp
@@ -1,6 +1,6 @@
 /*
 ** Lua binding: AllToLua
-** Generated automatically by tolua++-1.0.92 on 01/14/13 21:20:39.
+** Generated automatically by tolua++-1.0.92 on 01/19/13 07:27:33.
 */
 
 #ifndef __cplusplus
@@ -21043,6 +21043,7 @@ TOLUA_API int tolua_AllToLua_open (lua_State* tolua_S)
   tolua_constant(tolua_S,"BLOCK_FACE_WEST",BLOCK_FACE_WEST);
   tolua_constant(tolua_S,"BLOCK_FACE_EAST",BLOCK_FACE_EAST);
   tolua_constant(tolua_S,"DIG_STATUS_STARTED",DIG_STATUS_STARTED);
+  tolua_constant(tolua_S,"DIG_STATUS_CANCELLED",DIG_STATUS_CANCELLED);
   tolua_constant(tolua_S,"DIG_STATUS_FINISHED",DIG_STATUS_FINISHED);
   tolua_constant(tolua_S,"DIG_STATUS_DROP_HELD",DIG_STATUS_DROP_HELD);
   tolua_constant(tolua_S,"DIG_STATUS_SHOOT_EAT",DIG_STATUS_SHOOT_EAT);
@@ -21338,7 +21339,7 @@ TOLUA_API int tolua_AllToLua_open (lua_State* tolua_S)
    tolua_constant(tolua_S,"HOOK_PLAYER_MOVED",cPluginManager::HOOK_PLAYER_MOVED);
    tolua_constant(tolua_S,"HOOK_PLAYER_PLACED_BLOCK",cPluginManager::HOOK_PLAYER_PLACED_BLOCK);
    tolua_constant(tolua_S,"HOOK_PLAYER_PLACING_BLOCK",cPluginManager::HOOK_PLAYER_PLACING_BLOCK);
-   tolua_constant(tolua_S,"HOOK_PLAYER_RIGHTCLICK",cPluginManager::HOOK_PLAYER_RIGHTCLICK);
+   tolua_constant(tolua_S,"HOOK_PLAYER_RIGHT_CLICK",cPluginManager::HOOK_PLAYER_RIGHT_CLICK);
    tolua_constant(tolua_S,"HOOK_PLAYER_SHOOTING",cPluginManager::HOOK_PLAYER_SHOOTING);
    tolua_constant(tolua_S,"HOOK_PLAYER_SPAWNED",cPluginManager::HOOK_PLAYER_SPAWNED);
    tolua_constant(tolua_S,"HOOK_PLAYER_TOSSING_ITEM",cPluginManager::HOOK_PLAYER_TOSSING_ITEM);
diff --git a/source/Bindings.h b/source/Bindings.h
index 7f5d65722..8f93599b4 100644
--- a/source/Bindings.h
+++ b/source/Bindings.h
@@ -1,6 +1,6 @@
 /*
 ** Lua binding: AllToLua
-** Generated automatically by tolua++-1.0.92 on 01/14/13 21:20:39.
+** Generated automatically by tolua++-1.0.92 on 01/19/13 07:27:34.
 */
 
 /* Exported function */
diff --git a/source/PluginManager.cpp b/source/PluginManager.cpp
index 1e2cf0406..b05b7316a 100644
--- a/source/PluginManager.cpp
+++ b/source/PluginManager.cpp
@@ -666,7 +666,7 @@ bool cPluginManager::CallHookPlayerPlacingBlock(cPlayer & a_Player, int a_BlockX
 
 bool cPluginManager::CallHookPlayerRightClick(cPlayer & a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ)
 {
-	HookMap::iterator Plugins = m_Hooks.find(HOOK_PLAYER_RIGHTCLICK);
+	HookMap::iterator Plugins = m_Hooks.find(HOOK_PLAYER_RIGHT_CLICK);
 	if (Plugins == m_Hooks.end())
 	{
 		return false;
diff --git a/source/PluginManager.h b/source/PluginManager.h
index 8a095aba7..7c77c34d6 100644
--- a/source/PluginManager.h
+++ b/source/PluginManager.h
@@ -63,7 +63,7 @@ public:																	// tolua_export
 		HOOK_PLAYER_MOVED,
 		HOOK_PLAYER_PLACED_BLOCK,
 		HOOK_PLAYER_PLACING_BLOCK,
-		HOOK_PLAYER_RIGHTCLICK,
+		HOOK_PLAYER_RIGHT_CLICK,
 		HOOK_PLAYER_SHOOTING,
 		HOOK_PLAYER_SPAWNED,
 		HOOK_PLAYER_TOSSING_ITEM,
diff --git a/source/Plugin_NewLua.cpp b/source/Plugin_NewLua.cpp
index 3badafffb..fca1d5150 100644
--- a/source/Plugin_NewLua.cpp
+++ b/source/Plugin_NewLua.cpp
@@ -658,7 +658,7 @@ bool cPlugin_NewLua::OnPlayerPlacingBlock(cPlayer & a_Player, int a_BlockX, int
 bool cPlugin_NewLua::OnPlayerRightClick(cPlayer & a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ)
 {
 	cCSLock Lock(m_CriticalSection);
-	const char * FnName = GetHookFnName(cPluginManager::HOOK_PLAYER_RIGHTCLICK);
+	const char * FnName = GetHookFnName(cPluginManager::HOOK_PLAYER_RIGHT_CLICK);
 	ASSERT(FnName != NULL);
 	if (!PushFunction(FnName))
 	{
@@ -1171,7 +1171,7 @@ const char * cPlugin_NewLua::GetHookFnName(cPluginManager::PluginHook a_Hook)
 		case cPluginManager::HOOK_PLAYER_MOVED:          return "OnPlayerMoved";
 		case cPluginManager::HOOK_PLAYER_PLACED_BLOCK:   return "OnPlayerPlacedBlock";
 		case cPluginManager::HOOK_PLAYER_PLACING_BLOCK:  return "OnPlayerPlacingBlock";
-		case cPluginManager::HOOK_PLAYER_RIGHTCLICK:     return "OnPlayerRightClick";
+		case cPluginManager::HOOK_PLAYER_RIGHT_CLICK:    return "OnPlayerRightClick";
 		case cPluginManager::HOOK_PLAYER_SHOOTING:       return "OnPlayerShooting";
 		case cPluginManager::HOOK_PLAYER_SPAWNED:        return "OnPlayerSpawned";
 		case cPluginManager::HOOK_PLAYER_TOSSING_ITEM:   return "OnPlayerTossingItem";