fixs

1 files changed, 26 insertions, 26 deletions

diff --git a/sourcemod/scripting/bot2player_public.sp b/sourcemod/scripting/bot2player_public.sp
index 75793cc..5f5c3ba 100644
--- a/sourcemod/scripting/bot2player_public.sp
+++ b/sourcemod/scripting/bot2player_public.sp
@@ -107,29 +107,22 @@ public Action:Event_RoundStart(Handle:Event, const String:name[], bool:dontBroad
 	{
 		ClientSpecClient[i] = 0
 		WrongTeamWarning[i] = 0
+    NeedsDuck[i] = 0
+    
+    if (IsClientConnected(i) && IsClientInGame(i) && !IsClientObserver(i) && ClientTookover[i])
+    {
+      StripWeapons(GetClientUserId(i))
+    }
+    ClientTookover[i] = 0
 	}
 }
+
+
 public Action:Event_RoundEnd(Handle:Event, const String:name[], bool:dontBroadcast)
 {
     for (new i = 1; i <= MaxClients; i++)
     {
         ClientSpecClient[i] = 0
-        if (IsClientConnected(i) && IsClientInGame(i) && !IsClientObserver(i) && ClientTookover[i])
-        {
-            if (IsClientConnected(i))
-            {
-                PrintCenterText(i, "Since you took over BOT, you will not retain weapons")
-                //TeleportWarning[i] = 1
-                //new Float:iTargetOrigin[3]
-                //iTargetOrigin[0] = 0.0
-                //iTargetOrigin[1] = 0.0
-                //iTargetOrigin[2] = 0.0
-                //NormalizeVector(iTargetOrigin, iTargetOrigin)
-                //TeleportEntity(i, iTargetOrigin, NULL_VECTOR, NULL_VECTOR)
-            }
-            CreateTimer(Weapon_Strip_Delay, StripWeapons, GetClientUserId(i))
-        }
-        ClientTookover[i] = 0
         WrongTeamWarning[i] = 0
     }
     gameround++
@@ -321,6 +314,13 @@ public Action:StripWeapons(Handle:timer, any:UserID)
 	if (!client || !IsClientConnected(client)) return
 	Client_RemoveAllWeapons(client)
 	Client_GiveWeapon(client, "weapon_knife", true)
+  new playerTeam = GetClientTeam( client );
+  if( playerTeam == CS_TEAM_T ) {
+    GivePlayerItem( client, "weapon_glock" );
+  }
+  else if( playerTeam == CS_TEAM_CT ) {
+    GivePlayerItem( client, "weapon_usp" );
+  }
 }
 public Action:NewTarget(iClient, const String:cmd[], args)
 {
@@ -386,18 +386,18 @@ public Action:Event_PlayerDeath(Handle:Event, const String:name[], bool:dontBroa
 	if (!b2pEnabled) return Plugin_Continue
 	new iClient = GetClientOfUserId(GetEventInt(Event, "userid"))
 	if (!IsClientConnected(iClient)) return Plugin_Continue
-	if (!IsFakeClient(iClient)) CreateTimer(6.75, DisplayTakeOverMessage, iClient)
+	if (!IsFakeClient(iClient)) {
+    CreateTimer(6.75, DisplayTakeOverMessage, iClient)
+    return Plugin_Continue;
+  }
 	for (new i = 1; i <= MaxClients; i++)
 	{
-		if (i < GetClientCount(true))
-		{
-			new ClientCash = GetMoney(i)
-			if (IsClientConnected(iClient) && IsClientConnected(i) && IsClientInGame(i) && IsClientObserver(i) && ClientSpecClient[i] == iClient && ClientCash >= BotTakeverCost[i])
-			{
-				PrintHintText(i, "%N died - You can't control dead BOTs", iClient)
-				ClientSpecClient[i] = 0
-			}
-		}
+    new ClientCash = GetMoney(i)
+    if (IsClientConnected(iClient) && IsClientConnected(i) && IsClientInGame(i) && IsClientObserver(i) && ClientSpecClient[i] == iClient && ClientCash >= BotTakeverCost[i])
+    {
+      PrintHintText(i, "%N died - You can't control dead BOTs", iClient)
+      ClientSpecClient[i] = 0
+    }
 	}
 	if (!bHideDeath[iClient]) return Plugin_Continue
 	CreateTimer(0.2, tDestroyRagdoll, iClient)