Revert "General: Change some permissions around."

This reverts commit 62d27305fb.
This commit is contained in:
BotoX 2018-08-07 21:40:10 +02:00
parent 26aea3da35
commit 5fc9f08665
4 changed files with 17 additions and 14 deletions

View File

@ -346,7 +346,10 @@ public Action Command_Weapon(int client, int argc)
if(client >= 1)
{
if(!GetAdminFlag(GetUserAdmin(client), Admin_Root))
AdminId id = GetUserAdmin(client);
int superadmin = GetAdminFlag(id, Admin_Custom3);
if(!superadmin)
{
if(StrEqual(sWeapon, "weapon_c4", false) || StrEqual(sWeapon, "weapon_smokegrenade", false) || StrEqual(sWeapon, "item_defuser", false))
{

View File

@ -57,15 +57,15 @@ public void OnPluginStart()
g_Regex_RGB = CompileRegex("^(([01]?[0-9]?[0-9]|2[0-4][0-9]|25[0-5])\\s+){2}([01]?[0-9]?[0-9]|2[0-4][0-9]|25[0-5])$");
g_Regex_HEX = CompileRegex("^(#?)([A-Fa-f0-9]{6})$");
RegAdminCmd("sm_glowcolors", Command_GlowColors, ADMFLAG_CUSTOM1, "Change your players glowcolor. sm_glowcolors <RRGGBB HEX | 0-255 0-255 0-255 RGB CODE>");
RegAdminCmd("sm_glowcolours", Command_GlowColors, ADMFLAG_CUSTOM1, "Change your players glowcolor. sm_glowcolours <RRGGBB HEX | 0-255 0-255 0-255 RGB CODE>");
RegAdminCmd("sm_glowcolor", Command_GlowColors, ADMFLAG_CUSTOM1, "Change your players glowcolor. sm_glowcolor <RRGGBB HEX | 0-255 0-255 0-255 RGB CODE>");
RegAdminCmd("sm_glowcolour", Command_GlowColors, ADMFLAG_CUSTOM1, "Change your players glowcolor. sm_glowcolour <RRGGBB HEX | 0-255 0-255 0-255 RGB CODE>");
RegAdminCmd("sm_colors", Command_GlowColors, ADMFLAG_CUSTOM1, "Change your players glowcolor. sm_colors <RRGGBB HEX | 0-255 0-255 0-255 RGB CODE>");
RegAdminCmd("sm_colours", Command_GlowColors, ADMFLAG_CUSTOM1, "Change your players glowcolor. sm_colours <RRGGBB HEX | 0-255 0-255 0-255 RGB CODE>");
RegAdminCmd("sm_color", Command_GlowColors, ADMFLAG_CUSTOM1, "Change your players glowcolor. sm_color <RRGGBB HEX | 0-255 0-255 0-255 RGB CODE>");
RegAdminCmd("sm_colour", Command_GlowColors, ADMFLAG_CUSTOM1, "Change your players glowcolor. sm_colour <RRGGBB HEX | 0-255 0-255 0-255 RGB CODE>");
RegAdminCmd("sm_glow", Command_GlowColors, ADMFLAG_CUSTOM1, "Change your players glowcolor. sm_glow <RRGGBB HEX | 0-255 0-255 0-255 RGB CODE>");
RegAdminCmd("sm_glowcolors", Command_GlowColors, ADMFLAG_CUSTOM5, "Change your players glowcolor. sm_glowcolors <RRGGBB HEX | 0-255 0-255 0-255 RGB CODE>");
RegAdminCmd("sm_glowcolours", Command_GlowColors, ADMFLAG_CUSTOM5, "Change your players glowcolor. sm_glowcolours <RRGGBB HEX | 0-255 0-255 0-255 RGB CODE>");
RegAdminCmd("sm_glowcolor", Command_GlowColors, ADMFLAG_CUSTOM5, "Change your players glowcolor. sm_glowcolor <RRGGBB HEX | 0-255 0-255 0-255 RGB CODE>");
RegAdminCmd("sm_glowcolour", Command_GlowColors, ADMFLAG_CUSTOM5, "Change your players glowcolor. sm_glowcolour <RRGGBB HEX | 0-255 0-255 0-255 RGB CODE>");
RegAdminCmd("sm_colors", Command_GlowColors, ADMFLAG_CUSTOM5, "Change your players glowcolor. sm_colors <RRGGBB HEX | 0-255 0-255 0-255 RGB CODE>");
RegAdminCmd("sm_colours", Command_GlowColors, ADMFLAG_CUSTOM5, "Change your players glowcolor. sm_colours <RRGGBB HEX | 0-255 0-255 0-255 RGB CODE>");
RegAdminCmd("sm_color", Command_GlowColors, ADMFLAG_CUSTOM5, "Change your players glowcolor. sm_color <RRGGBB HEX | 0-255 0-255 0-255 RGB CODE>");
RegAdminCmd("sm_colour", Command_GlowColors, ADMFLAG_CUSTOM5, "Change your players glowcolor. sm_colour <RRGGBB HEX | 0-255 0-255 0-255 RGB CODE>");
RegAdminCmd("sm_glow", Command_GlowColors, ADMFLAG_CUSTOM5, "Change your players glowcolor. sm_glow <RRGGBB HEX | 0-255 0-255 0-255 RGB CODE>");
RegAdminCmd("sm_rainbow", Command_Rainbow, ADMFLAG_CUSTOM1, "Enable rainbow glowcolors. sm_rainbow [frequency]");
@ -172,7 +172,7 @@ public void OnClientPostAdminCheck(int client)
void ReadClientCookies(int client)
{
char sCookie[16];
if(CheckCommandAccess(client, "sm_glowcolors", ADMFLAG_CUSTOM1))
if(CheckCommandAccess(client, "sm_glowcolors", ADMFLAG_CUSTOM5))
GetClientCookie(client, g_hClientCookie, sCookie, sizeof(sCookie));
if(StrEqual(sCookie, ""))
@ -187,7 +187,7 @@ void ReadClientCookies(int client)
public void OnClientDisconnect(int client)
{
if(CheckCommandAccess(client, "sm_glowcolors", ADMFLAG_CUSTOM1))
if(CheckCommandAccess(client, "sm_glowcolors", ADMFLAG_CUSTOM5))
{
if(g_aGlowColor[client][0] == 255 &&
g_aGlowColor[client][1] == 255 &&

View File

@ -170,7 +170,7 @@ public Action Command_Status(int client, const char[] command, int args)
else
FormatEx(sPlayerState, sizeof(sPlayerState), "spawning");
if(GetAdminFlag(GetUserAdmin(client), Admin_Root))
if(GetAdminFlag(GetUserAdmin(client), Admin_Custom3))
GetClientIP(player, sPlayerAddr, sizeof(sPlayerAddr));
PrintToConsole(client, "# %8s %40s %24s %12s %4s %4s %s %s",

View File

@ -2592,7 +2592,7 @@ public Action Hook_UserMessage(UserMsg msg_id, Handle bf, const players[], int p
}
}
if (!g_msgAuthor || HasFlag(g_msgAuthor, Admin_Custom1))
if (!g_msgAuthor || HasFlag(g_msgAuthor, Admin_Generic))
{
CFormatColor(g_msgText, sizeof(g_msgText), g_msgAuthor);
}