Skip to content

fix: gloves and agent model after ag2 update #490

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

Merged
daffyyyy merged 6 commits into from
Apr 23, 2026
Merged

fix: gloves and agent model after ag2 update #490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
54b2868
fix(gloves): apply hotfix, a better solution may be possible
stefanx111 Apr 21, 2026
139a1da
fix(agents): fix model
stefanx111 Apr 21, 2026
7694f66
fix(gloves): prevent model overlap
stefanx111 Apr 23, 2026
b643c95
fix(gloves): print selected gloves
stefanx111 Apr 23, 2026
3e2871f
feat(agents): add agents file
stefanx111 Apr 23, 2026
8fa4ec6
Bump css version
daffyyyy Apr 23, 2026
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
5 changes: 5 additions & 0 deletions Commands.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,6 +538,11 @@ private void SetupGlovesMenu()
AddTimer(2.0f, () => _playerWeaponImage.Remove(player.Slot), CounterStrikeSharp.API.Modules.Timers.TimerFlags.STOP_ON_MAPCHANGE);
}

if (!string.IsNullOrEmpty(Localizer["wp_glove_menu_select"]))
{
player.Print(Localizer["wp_glove_menu_select", selectedPaintName]);
}

PlayerInfo playerInfo = new PlayerInfo
{
UserId = player.UserId,
Expand Down
2 changes: 1 addition & 1 deletion Events.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ public HookResult OnItemPickup(EventItemPickup @event, GameEventInfo _)
if (!HasChangedKnife(player, out var _) || !HasChangedPaint(player, weaponDefIndex, out var _))
return HookResult.Continue;

if (player is { Connected: PlayerConnectedState.PlayerConnected, PawnIsAlive: true, PlayerPawn.IsValid: true })
if (player is { Connected: PlayerConnectedState.Connected, PawnIsAlive: true, PlayerPawn.IsValid: true })
{
GiveOnItemPickup(player);
}
Expand Down
2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.2a
3.3a
20 changes: 9 additions & 11 deletions WeaponAction.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,18 +385,13 @@ private void GivePlayerGloves(CCSPlayerController player)
if (pawn == null || !pawn.IsValid)
return;

var model = pawn.CBodyComponent?.SceneNode?.GetSkeletonInstance()?.ModelState.ModelName ?? string.Empty;
if (!string.IsNullOrEmpty(model))
{
pawn.SetModel("characters/models/tm_jumpsuit/tm_jumpsuit_varianta.vmdl");
pawn.SetModel(model);
}

CEconItemView item = pawn.EconGloves;

item.NetworkedDynamicAttributes.Attributes.RemoveAll();
item.AttributeList.Attributes.RemoveAll();

//force gloves model refresh to prevent model overlap
player.ExecuteClientCommand("lastinv");
Instance.AddTimer(0.08f, () =>
{
try
Expand Down Expand Up @@ -426,10 +421,13 @@ private void GivePlayerGloves(CCSPlayerController player)
CAttributeListSetOrAddAttributeValueByName.Invoke(item.AttributeList.Handle, "set item texture prefab", weaponInfo.Paint);
CAttributeListSetOrAddAttributeValueByName.Invoke(item.AttributeList.Handle, "set item texture seed", weaponInfo.Seed);
CAttributeListSetOrAddAttributeValueByName.Invoke(item.AttributeList.Handle, "set item texture wear", weaponInfo.Wear);

item.Initialized = true;

SetBodygroup(pawn, "default_gloves", 1);
item.Initialized = true;

//force gloves model refresh to prevent model overlap
player.ExecuteClientCommand("lastinv");
SetBodygroup(pawn, "first_or_third_person", 0);
AddTimer(0.2f, () => SetBodygroup(pawn, "first_or_third_person", 1), TimerFlags.STOP_ON_MAPCHANGE);
}
catch (Exception) { }
}, TimerFlags.STOP_ON_MAPCHANGE);
Expand Down Expand Up @@ -493,7 +491,7 @@ private static void GivePlayerAgent(CCSPlayerController player)
Server.NextFrame(() =>
{
player.PlayerPawn.Value.SetModel(
$"characters/models/{model}.vmdl"
$"agents/models/{model}.vmdl"
);
});
}
Expand Down
4 changes: 2 additions & 2 deletions WeaponPaints.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig
public override string ModuleAuthor => "Nereziel & daffyy";
public override string ModuleDescription => "Skin, gloves, agents and knife selector, standalone and web-based";
public override string ModuleName => "WeaponPaints";
public override string ModuleVersion => "3.2b";
public override string ModuleVersion => "3.3a";

public override void Load(bool hotReload)
{
Expand All @@ -47,7 +47,7 @@ public override void Load(bool hotReload)
.OfType<CCSPlayerController>(Utilities.GetPlayers().TakeWhile(_ => WeaponSync != null))
.Where(player => player.IsValid &&
!string.IsNullOrEmpty(player.IpAddress) && player is
{ IsBot: false, Connected: PlayerConnectedState.PlayerConnected }))
{ IsBot: false, Connected: PlayerConnectedState.Connected }))
{
var playerInfo = new PlayerInfo
{
Expand Down
4 changes: 2 additions & 2 deletions WeaponPaints.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="CounterStrikeSharp.API" Version="1.0.361" />
<PackageReference Include="Dapper" Version="2.1.66" />
<PackageReference Include="CounterStrikeSharp.API" Version="1.0.367" />
<PackageReference Include="Dapper" Version="2.1.72" />
<PackageReference Include="MySqlConnector" Version="2.5.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.5-beta1" />
</ItemGroup>
Expand Down
Loading
Loading