From 8d8b2c34c75181eb1746a5213c430d7b691e441d Mon Sep 17 00:00:00 2001 From: Dawid Bepierszcz <41084667+daffyyyy@users.noreply.github.com> Date: Sat, 19 Oct 2024 10:36:33 +0200 Subject: [PATCH] 2.8b - Stickers fix --- VERSION | 2 +- WeaponAction.cs | 17 ++++++++--------- WeaponPaints.cs | 2 +- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/VERSION b/VERSION index d4223c5d..f6f99fe3 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.8a \ No newline at end of file +2.8b \ No newline at end of file diff --git a/WeaponAction.cs b/WeaponAction.cs index db830391..a7117006 100644 --- a/WeaponAction.cs +++ b/WeaponAction.cs @@ -101,9 +101,9 @@ namespace WeaponPaints return; if (isKnife) return; - - if (weaponInfo.Stickers.Count > 0) SetStickers(player, weapon); + if (weaponInfo.KeyChain != null) SetKeychain(player, weapon); + if (weaponInfo.Stickers.Count > 0) SetStickers(player, weapon); UpdatePlayerWeaponMeshGroupMask(player, weapon, !newPaints.Contains(fallbackPaintKit)); } @@ -145,15 +145,14 @@ namespace WeaponPaints foreach (var sticker in weaponInfo.Stickers) { int stickerSlot = weaponInfo.Stickers.IndexOf(sticker); - CAttributeListSetOrAddAttributeValueByName.Invoke(weapon.AttributeManager.Item.NetworkedDynamicAttributes.Handle, $"sticker slot {stickerSlot} id", ViewAsFloat(sticker.Id)); - CAttributeListSetOrAddAttributeValueByName.Invoke(weapon.AttributeManager.Item.NetworkedDynamicAttributes.Handle, - $"sticker slot {stickerSlot} schema", sticker.Schema); - CAttributeListSetOrAddAttributeValueByName.Invoke(weapon.AttributeManager.Item.NetworkedDynamicAttributes.Handle, - $"sticker slot {stickerSlot} offset x", sticker.OffsetX); - CAttributeListSetOrAddAttributeValueByName.Invoke(weapon.AttributeManager.Item.NetworkedDynamicAttributes.Handle, - $"sticker slot {stickerSlot} offset y", sticker.OffsetY); + // CAttributeListSetOrAddAttributeValueByName.Invoke(weapon.AttributeManager.Item.NetworkedDynamicAttributes.Handle, + // $"sticker slot {stickerSlot} schema", stickerSlot); + // CAttributeListSetOrAddAttributeValueByName.Invoke(weapon.AttributeManager.Item.NetworkedDynamicAttributes.Handle, + // $"sticker slot {stickerSlot} offset x", sticker.OffsetX); + // CAttributeListSetOrAddAttributeValueByName.Invoke(weapon.AttributeManager.Item.NetworkedDynamicAttributes.Handle, + // $"sticker slot {stickerSlot} offset y", sticker.OffsetY); CAttributeListSetOrAddAttributeValueByName.Invoke(weapon.AttributeManager.Item.NetworkedDynamicAttributes.Handle, $"sticker slot {stickerSlot} wear", sticker.Wear); CAttributeListSetOrAddAttributeValueByName.Invoke(weapon.AttributeManager.Item.NetworkedDynamicAttributes.Handle, diff --git a/WeaponPaints.cs b/WeaponPaints.cs index 9fb18b75..2b11b5e5 100644 --- a/WeaponPaints.cs +++ b/WeaponPaints.cs @@ -16,7 +16,7 @@ public partial class WeaponPaints : BasePlugin, IPluginConfig "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 => "2.8a"; + public override string ModuleVersion => "2.8b"; public override void Load(bool hotReload) {