Last merge conflicts

This commit is contained in:
Valentin Barat
2024-02-04 15:49:37 +01:00
parent 40ad4b995c
commit a85e5c69ee
2 changed files with 343 additions and 290 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -95,9 +95,9 @@ namespace CS2_SimpleAdmin.Menus
MenuManager.OpenCenterHtmlMenu(CS2_SimpleAdmin.Instance, admin, menu);
}
private static void ApplySlapAndKeepMenu(CCSPlayerController admin, CCSPlayerController player, int i)
private static void ApplySlapAndKeepMenu(CCSPlayerController admin, CCSPlayerController player, int damage)
{
CS2_SimpleAdmin.Instance.Slap(admin, player, i);
CS2_SimpleAdmin.Instance.Slap(admin, player, damage);
SlapMenu(admin, player);
}