Merge remote-tracking branch 'unloze/master'

and fix like everything
This commit is contained in:
BotoX
2019-07-25 00:14:52 +02:00
1024 changed files with 52953 additions and 9868 deletions
+11 -11
View File
@@ -1,14 +1,14 @@
//"STEAM_0:0:22286324" // rogan
"STEAM_0:0:22286324" // rogan
"STEAM_0:1:32247009" // neon
"STEAM_0:1:39773416" // omar
"STEAM_0:1:15222492" // shitsal
"STEAM_0:0:50822239" // banya
"STEAM_0:1:13348241" // juggernaut
"STEAM_0:1:49355699" // daniel-san
"STEAM_0:0:23670843" // monkey
"STEAM_0:1:12552642" // dad
"STEAM_0:1:52451965" // black dragon
"STEAM_0:1:79341741" // warped
"STEAM_0:1:107271710" // consolo
"STEAM_0:0:13007543" // anal sex by force
"STEAM_0:0:419740855" // phantom
"STEAM_0:0:38786924" // tom
"STEAM_0:0:30963326" // kabzor
"STEAM_0:1:69650476" // william
"STEAM_0:1:23546931" // dejade
"STEAM_0:0:61503660" // silentbang
"STEAM_0:0:20936525" // baka
"STEAM_0:1:52451965" // Black Dragon
"STEAM_0:1:79535030" // Chivas
"STEAM_0:1:33769988" // Otonikak
"STEAM_0:1:24322623" // pivo
+27 -17
View File
@@ -495,18 +495,23 @@ public Action Leader(int client, int args)
}
else
{
if(IsPlayerAlive(target))
if(!IsPlayerAlive(target))
{
ReplyToCommand(client, "[SM] The target has to be alive!");
return Plugin_Handled;
}
else if(ZR_IsClientZombie(target))
{
ReplyToCommand(client, "[SM] The target has to be a human!");
return Plugin_Handled;
}
else
{
SetLeader(target);
PrintToChatAll("[SM] %N is the new leader!", target);
PrintToChat(target, "[SM] You are now the leader! Type !leader to open up the leader menu.");
LeaderMenu(target);
return Plugin_Handled;
}
else
{
ReplyToCommand(client, "[SM] The target has to be alive!");
return Plugin_Handled;
return Plugin_Handled;
}
}
}
@@ -517,18 +522,23 @@ public Action Leader(int client, int args)
LeaderMenu(client);
return Plugin_Handled;
}
if(IsPlayerAlive(client))
if(!IsPlayerAlive(client))
{
ReplyToCommand(client, "[SM] The target has to be alive!");
return Plugin_Handled;
}
else if(ZR_IsClientZombie(client))
{
ReplyToCommand(client, "[SM] The target has to be a human!");
return Plugin_Handled;
}
else
{
SetLeader(client);
PrintToChatAll("[SM] %N is the new leader!", client);
PrintToChat(client, "[SM] You are now the leader! Type !leader to open up the leader menu.");
LeaderMenu(client);
return Plugin_Handled;
}
else
{
ReplyToCommand(client, "[SM] The target has to be alive!");
return Plugin_Handled;
return Plugin_Handled;
}
}
else
@@ -816,7 +826,7 @@ public int LeaderMenu_Handler(Handle menu, MenuAction action, int client, int po
}
else if(action == MenuAction_End)
{
CloseHandle(menu);
delete menu;
}
}
@@ -912,7 +922,7 @@ public int SpriteMenu_Handler(Handle menu, MenuAction action, int client, int po
}
else if(action == MenuAction_End)
{
CloseHandle(menu);
delete menu;
}
else if (action == MenuAction_Cancel && position == MenuCancel_ExitBack)
{
@@ -989,7 +999,7 @@ public int MarkerMenu_Handler(Handle menu, MenuAction action, int client, int po
}
else if(action == MenuAction_End)
{
CloseHandle(menu);
delete menu;
}
else if (action == MenuAction_Cancel && position == MenuCancel_ExitBack)
{