修复上次更新产生的错误

fantasylidong · Mar 24, 2024 · 5a73a6b · 5a73a6b
1 parent f819349
commit 5a73a6b
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 22 deletions.
diff --git a/addons/sourcemod/plugins/extend/l4d_stats.smx b/addons/sourcemod/plugins/extend/l4d_stats.smx
diff --git a/addons/sourcemod/plugins/extend/rpg.smx b/addons/sourcemod/plugins/extend/rpg.smx
diff --git a/addons/sourcemod/plugins/funcommands.smx b/addons/sourcemod/plugins/funcommands.smx
diff --git a/addons/sourcemod/scripting/extend/l4d_stats.sp b/addons/sourcemod/scripting/extend/l4d_stats.sp
@@ -9734,7 +9734,7 @@ public CheckSurvivorsWin()
 
 	CampaignOver = true;
 	//StatsPrintToChatTeam(TEAM_SURVIVORS, "\x03CampaignOver值没问题!");
-	StopMapTiming();
+	if(!StopMapTiming())return;
 	CurrentGamemodeID = GetCurrentGamemodeID();
 	// Return if gamemode is Scavenge or Survival
 	if (CurrentGamemodeID == GAMEMODE_SCAVENGE ||
@@ -9749,17 +9749,6 @@ public CheckSurvivorsWin()
 	decl String:UpdatePoints[32], String:UpdatePointsPenalty[32];
 	new ClientTeam, bool:NegativeScore = GetConVarBool(cvar_EnableNegativeScore);
 
-	if (!MapTimingEnabled() || MapTimingStartTime <= 0.0)
-	{
-		return;
-	}
-	new Float:TotalTime = GetEngineTime() - MapTimingStartTime;
-	if(TotalTime < 30.0)
-	{
-		StatsPrintToChatAll("记录时间小于30s，数据应该不对，没有分数奖励!(PS: 30s能完成的图算啥图)");
-		return;
-	}
-
 	switch (CurrentGamemodeID)
 	{
 		case GAMEMODE_VERSUS:
@@ -11147,11 +11136,11 @@ GetCurrentDifficulty()
 	else return 0;
 }
 
-public StopMapTiming()
+public bool StopMapTiming()
 {
 	if (!MapTimingEnabled() || MapTimingStartTime <= 0.0 || StatsDisabled())
 	{
-		return;
+		return false;
 	}
 	if(g_brpgAvailable && !L4D_RPG_GetGlobalValue(INDEX_VALID))
 	{
@@ -11161,7 +11150,7 @@ public StopMapTiming()
 		}
 		MapTimingStartTime = -1.0;
 		MapTimingBlocked = true;
-		return;
+		return false;
 	}
 	if(!IsNormalMode() && !IsThisRoundValid())
 	{
@@ -11171,7 +11160,7 @@ public StopMapTiming()
 		}
 		MapTimingStartTime = -1.0;
 		MapTimingBlocked = true;
-		return;
+		return false;
 	}
 	int mode = 0;
 	if(IsAnne())
@@ -11196,14 +11185,14 @@ public StopMapTiming()
 		StatsPrintToChatAll("启用了多人运动模式，不记录这张地图游戏时间!");
 		MapTimingStartTime = -1.0;
 		MapTimingBlocked = true;
-		return;
+		return false;
 	}
 
 	new Float:TotalTime = GetEngineTime() - MapTimingStartTime;
 	if(TotalTime < 30.0)
 	{
 		StatsPrintToChatAll("记录时间小于30s，数据应该不对，没有分数奖励!(PS: 30s能完成的图算啥图)");
-		return;
+		return false;
 	}
 
 	MapTimingStartTime = -1.0;
@@ -11242,8 +11231,8 @@ public StopMapTiming()
 	}
 
 	// Game ended because all of the infected team left the server... don't record the time!
-	if (InfectedCounter <= 0)
-		return;
+	//if (InfectedCounter <= 0)
+		//return;
 
 	new GameDifficulty = GetCurrentDifficulty();
 	if(mode > 0)
@@ -11291,6 +11280,7 @@ public StopMapTiming()
 	}
 
 	ClearTrie(MapTimingSurvivors);
+	return true;
 }
 
 GetThisModeBestTime(int UseBuy=0)

diff --git a/addons/sourcemod/scripting/extend/rpg.sp b/addons/sourcemod/scripting/extend/rpg.sp
@@ -591,7 +591,10 @@ public void OnClientPostAdminCheck(int client)
 {
 	if(!IsValidClient(client) || IsFakeClient(client))
 		return;
-	player[client].ClientFirstBuy = false;
+	if(IsStart)
+		player[client].ClientFirstBuy = false;
+	else
+		player[client].ClientFirstBuy = true;
 	player[client].ClientRecoil = 1;
 	player[client].CanBuy=true;
 	player[client].ClientPoints = 500;

diff --git a/addons/sourcemod/scripting/sourcemod/funcommands/noclip.sp b/addons/sourcemod/scripting/sourcemod/funcommands/noclip.sp
@@ -125,7 +125,8 @@ public int MenuHandler_NoClip(Menu menu, MenuAction action, int param1, int para
 
 			PerformNoClip(param1, target);
 			ShowActivity2(param1, "[SM] ", "%t", "Toggled noclip on target", "_s", name);
-			if(g_bRPG)L4D_RPG_SetGlobalValue(INDEX_VALID, false);
+			if(g_bRPG && GetUserAdmin(target).ImmunityLevel < 100 )
+				L4D_RPG_SetGlobalValue(INDEX_VALID, false);
 		}
 
 		/* Re-draw the menu if they're still valid */