Merge pull request #289 from KZGlobalTeam/dev

Merging github workflow files
KZGlobalTeam · Mar 26, 2022 · 7f98d4b · 7f98d4b
2 parents 33a3a49 + 618352c
commit 7f98d4b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -0,0 +1,4 @@
+
+>>> Make sure the destination branch of your pull request is `dev` and not `master`! <<<
+(Please remove this message for your actual PR)
+
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -6,7 +6,7 @@ env:
 on:
   push:
     branches: [ master, dev ]
-    tags: [ 'v*' ]
+    tags: [ '*' ]
   pull_request:
     branches: [ master, dev ]
 

diff --git a/addons/sourcemod/scripting/gokz-replays/playback.sp b/addons/sourcemod/scripting/gokz-replays/playback.sp
@@ -1155,7 +1155,7 @@ static void SetBotStuff(int bot)
 	GivePlayerItem(client, "weapon_knife");
 
 	// Give the bot the pistol stored in the replay
-	if (botWeapon[bot] != 0)
+	if (botWeapon[bot] != -1)
 	{
 		CS_WeaponIDToAlias(CS_ItemDefIndexToID(botWeapon[bot]), weaponName, sizeof(weaponName));
 		Format(weaponName, sizeof(weaponName), "weapon_%s", weaponName);
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,4 @@

		>>> Make sure the destination branch of your pull request is `dev` and not `master`! <<<
		(Please remove this message for your actual PR)