Merge pull request #334 from daffyyyy/main

GiveSkin fix

Commands.cs

@@ -164,17 +164,9 @@ public partial class WeaponPaints
 		if (!teamWeapons.TryGetValue(weapon.AttributeManager.Item.ItemDefinitionIndex, out var teamWeapon))
 			return;
 
-		if (teamWeapon.StatTrak)
+		teamWeapon.StatTrak = !teamWeapon.StatTrak;
-		{
+		RefreshWeapons(player);
-			teamWeapon.StatTrak = false;
+
-			RefreshWeapons(player);
-		}
-		else
-		{
-			teamWeapon.StatTrak = true;
-			RefreshWeapons(player);
-		}
-		
 		if (!string.IsNullOrEmpty(Localizer["wp_stattrak_action"]))
 		{
 			player.Print(Localizer["wp_stattrak_action"]);

Events.cs

@@ -121,6 +121,9 @@ namespace WeaponPaints
 			
 			if (Database != null)
 				WeaponSync = new WeaponSynchronization(Database, Config);
+
+			_fadeSeed = 0;
+			_nextItemId = MinimumCustomItemId;
 		}
 
 		private HookResult OnPlayerSpawn(EventPlayerSpawn @event, GameEventInfo info)

VERSION

@@ -1 +1 @@
-3.0a
+3.0b

Variables.cs

@@ -165,4 +165,6 @@ public partial class WeaponPaints
 	
 	internal static IMenuApi? MenuApi;
 	private static readonly PluginCapability<IMenuApi> MenuCapability = new("menu:nfcore");
+	
+	private int _fadeSeed;
 }

WeaponAction.cs

@@ -44,7 +44,7 @@ namespace WeaponPaints
 			UpdatePlayerEconItemId(weapon.AttributeManager.Item);
 
 			int weaponDefIndex = weapon.AttributeManager.Item.ItemDefinitionIndex;
-			int fallbackPaintKit = 0;
+			int fallbackPaintKit;
 			
 			weapon.AttributeManager.Item.AccountID = (uint)player.SteamID;
 			
@@ -85,7 +85,11 @@ namespace WeaponPaints
 				return;
 			}
 
-			if (!GPlayerWeaponsInfo[player.Slot][player.Team].TryGetValue(weaponDefIndex, out var value) || value.Paint == 0) return;
+			if (!GPlayerWeaponsInfo.TryGetValue(player.Slot, out var teamInfo) || 
+			    !teamInfo.TryGetValue(player.Team, out var teamWeapons) )
+				return;
+			if (!teamWeapons.TryGetValue(weaponDefIndex, out var value))
+				return;
 
 			var weaponInfo = value;
 			//Log($"Apply on {weapon.DesignerName}({weapon.AttributeManager.Item.ItemDefinitionIndex}) paint {gPlayerWeaponPaints[steamId.SteamId64][weapon.AttributeManager.Item.ItemDefinitionIndex]} seed {gPlayerWeaponSeed[steamId.SteamId64][weapon.AttributeManager.Item.ItemDefinitionIndex]} wear {gPlayerWeaponWear[steamId.SteamId64][weapon.AttributeManager.Item.ItemDefinitionIndex]}");
@@ -98,7 +102,16 @@ namespace WeaponPaints
 			weapon.AttributeManager.Item.ItemIDHigh = weapon.AttributeManager.Item.ItemIDLow >> 32;
 			weapon.AttributeManager.Item.CustomName = weaponInfo.Nametag;
 			weapon.FallbackPaintKit = weaponInfo.Paint;
-			weapon.FallbackSeed = weaponInfo.Seed;
+			
+			if (weaponInfo is { Paint: 38, Seed: 0 })
+			{
+				weapon.FallbackSeed = _fadeSeed++;
+			}
+			else
+			{
+				weapon.FallbackSeed = weaponInfo.Seed;
+			}
+			
 			weapon.FallbackWear = weaponInfo.Wear;
 			CAttributeListSetOrAddAttributeValueByName.Invoke(weapon.AttributeManager.Item.NetworkedDynamicAttributes.Handle, "set item texture prefab", weapon.FallbackPaintKit);
 

WeaponPaints.cs

@@ -16,7 +16,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.0a";
+	public override string ModuleVersion => "3.0b";
 
 	public override void Load(bool hotReload)
 	{