Merge pull request #1258 from normalamron/pracfix

rtldg · web-flow · commit a5bec0403b33 · 2025-09-30T23:34:50.000Z
diff --git a/addons/sourcemod/scripting/shavit-core.sp b/addons/sourcemod/scripting/shavit-core.sp
@@ -2301,7 +2301,7 @@ public int Native_SetPracticeMode(Handle handler, int numParams)
 	bool practice = view_as<bool>(GetNativeCell(2));
 	bool alert = view_as<bool>(GetNativeCell(3));
 
-	if(alert && practice && !gA_Timers[client].bPracticeMode && (!gB_HUD || (Shavit_GetHUDSettings(client) & HUD_NOPRACALERT) == 0))
+	if(alert && practice && !gA_Timers[client].bPracticeMode && (!gB_HUD || (Shavit_GetHUDSettings(client) & HUD_NOPRACALERT) == 0) && !Shavit_InsideZone(client, Zone_Start, -1))
 	{
 		Shavit_PrintToChat(client, "%T", "PracticeModeAlert", client, gS_ChatStrings.sWarning, gS_ChatStrings.sText);
 	}

Original file line number	Diff line number	Diff line change
`@@ -2301,7 +2301,7 @@ public int Native_SetPracticeMode(Handle handler, int numParams)`
`2301`	`2301`	`bool practice = view_as<bool>(GetNativeCell(2));`
`2302`	`2302`	`bool alert = view_as<bool>(GetNativeCell(3));`
`2303`	`2303`
`2304`		`- if(alert && practice && !gA_Timers[client].bPracticeMode && (!gB_HUD \|\| (Shavit_GetHUDSettings(client) & HUD_NOPRACALERT) == 0))`
	`2304`	`+ if(alert && practice && !gA_Timers[client].bPracticeMode && (!gB_HUD \|\| (Shavit_GetHUDSettings(client) & HUD_NOPRACALERT) == 0) && !Shavit_InsideZone(client, Zone_Start, -1))`
`2305`	`2305`	`{`
`2306`	`2306`	`Shavit_PrintToChat(client, "%T", "PracticeModeAlert", client, gS_ChatStrings.sWarning, gS_ChatStrings.sText);`
`2307`	`2307`	`}`