Skip to content

Commit 4d505bb

Browse files
committed
Fix: Threading issue
1 parent d7d4870 commit 4d505bb

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

PLUGIN/Database/Functions.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -187,15 +187,15 @@ private void LoadPlayerWeaponPreferences(CCSPlayerController player)
187187
}
188188
}
189189

190-
private static void DeleteWeaponPreferencesFromDb(CCSPlayerController player, int teamNum)
190+
private static void DeleteWeaponPreferencesFromDb(ulong steamId, int teamNum)
191191
{
192192
try
193193
{
194194
using var connection = new MySqlConnection(_connectionString);
195195

196196
connection.Execute(
197197
"DELETE FROM vip_weapon_preferences WHERE steamid64 = @SteamID AND team_num = @TeamNum",
198-
new { player.SteamID, TeamNum = teamNum }
198+
new { SteamID = steamId, TeamNum = teamNum }
199199
);
200200
}
201201
catch (Exception ex)
@@ -338,4 +338,4 @@ private static void RecordVipTestUsage(ulong steamId, string playerName)
338338
new { SteamID = steamId, Name = playerName, Date = currentTime }
339339
);
340340
}
341-
}
341+
}

PLUGIN/Manager/WeaponMenuManager.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ private HookResult OnPlayerConnectFullWeaponMenu(EventPlayerConnectFull @event,
3434
return HookResult.Continue;
3535

3636
Server.NextFrame(() => {
37-
Task.Run(() => LoadPlayerWeaponPreferences(player));
37+
LoadPlayerWeaponPreferences(player);
3838
});
3939

4040
return HookResult.Continue;
@@ -441,8 +441,9 @@ private static void RemoveTeamWeaponSelection(CCSPlayerController player, int te
441441

442442
if (cachedPlayer.WeaponSelections.TryGetValue(teamNum, out _))
443443
{
444+
var steamId = player.SteamID;
444445
Server.NextFrame(() => {
445-
Task.Run(() => DeleteWeaponPreferencesFromDb(player, teamNum));
446+
Task.Run(() => DeleteWeaponPreferencesFromDb(steamId, teamNum));
446447
});
447448

448449
cachedPlayer.WeaponSelections.Remove(teamNum);

0 commit comments

Comments
 (0)