Manual merge of #4498.

Credit to @MeMuXin

Closes #4498
This commit is contained in:
Alexander Harkness
2020-03-23 12:18:12 +00:00
parent 7d05e4402f
commit 0a68994f48
10 changed files with 50 additions and 11 deletions
+15 -2
View File
@@ -794,11 +794,11 @@ bool cPluginManager::CallHookPlayerLeftClick(cPlayer & a_Player, int a_BlockX, i
bool cPluginManager::CallHookPlayerMoving(cPlayer & a_Player, const Vector3d & a_OldPosition, const Vector3d & a_NewPosition)
bool cPluginManager::CallHookPlayerMoving(cPlayer & a_Player, const Vector3d & a_OldPosition, const Vector3d & a_NewPosition, bool a_PreviousIsOnGround)
{
return GenericCallHook(HOOK_PLAYER_MOVING, [&](cPlugin * a_Plugin)
{
return a_Plugin->OnPlayerMoving(a_Player, a_OldPosition, a_NewPosition);
return a_Plugin->OnPlayerMoving(a_Player, a_OldPosition, a_NewPosition, a_PreviousIsOnGround);
}
);
}
@@ -846,6 +846,19 @@ bool cPluginManager::CallHookPlayerPlacingBlock(cPlayer & a_Player, const sSetBl
bool cPluginManager::CallHookPlayerCrouched(cPlayer & a_Player)
{
return GenericCallHook(HOOK_PLAYER_CROUCHED, [&](cPlugin * a_Plugin)
{
return a_Plugin->OnPlayerCrouched(a_Player);
}
);
}
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)
{
return GenericCallHook(HOOK_PLAYER_RIGHT_CLICK, [&](cPlugin * a_Plugin)