Skip to content

fix: saved weapon loadout permissions #627

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
saber9k wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −2
Open

fix: saved weapon loadout permissions #627

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions vMenu/CommonFunctions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2825,9 +2825,14 @@ public static async Task SpawnWeaponLoadoutAsync(string saveName, bool appendWea
{
Game.PlayerPed.Weapons.RemoveAll();
}

// Resolve permission by weapon name instead of using the saved Perm value.
// Permission enum values change as new weapons are added, so an old saved loadout can deserialize to the wrong permission.
Permission ResolveCurrentPerm(ValidWeapon wp) =>
ValidWeapons.weaponPermissions.TryGetValue(wp.SpawnName, out var p) ? p : Permission.WPSpawn;

// Check if any weapon is not allowed.
if (!ignoreSettingsAndPerms && loadout.Any((wp) => !IsAllowed(wp.Perm)))
if (loadout.Any((wp) => !IsAllowed(ResolveCurrentPerm(wp))))
{
Notify.Alert("One or more weapon(s) in this saved loadout are not allowed on this server. Those weapons will not be loaded.");
}
Expand All @@ -2842,7 +2847,7 @@ public static async Task SpawnWeaponLoadoutAsync(string saveName, bool appendWea
continue;
}

if (ignoreSettingsAndPerms || IsAllowed(w.Perm))
if (IsAllowed(ResolveCurrentPerm(w)))
{
// Give the weapon
GiveWeaponToPed(Game.PlayerPed.Handle, w.Hash, w.CurrentAmmo > -1 ? w.CurrentAmmo : w.GetMaxAmmo, false, false);
Expand Down