Merge pull request #330 from daffyyyy/main

Sticker position re-added

Events.cs

@@ -9,6 +9,8 @@ namespace WeaponPaints
 {
 	public partial class WeaponPaints
 	{
+		private bool _mvpPlayed;
+		
 		[GameEventHandler]
 		public HookResult OnClientFullConnect(EventPlayerConnectFull @event, GameEventInfo info)
 		{
@@ -148,6 +150,39 @@ namespace WeaponPaints
 		private HookResult OnRoundStart(EventRoundStart @event, GameEventInfo info)
 		{
 			_gBCommandsAllowed = true;
+			_mvpPlayed = false;
+			return HookResult.Continue;
+		}
+		
+		private HookResult OnRoundMvp(EventRoundMvp @event, GameEventInfo info)
+		{
+			if (_mvpPlayed)
+				return HookResult.Continue;
+			
+			var player = @event.Userid;
+			
+			if (player == null || !player.IsValid || player.IsBot)
+				return HookResult.Continue;
+
+			if (!(GPlayersMusic.TryGetValue(player.Slot, out var musicInfo)
+			      && musicInfo.TryGetValue(player.Team, out var musicId)
+			      && musicId != 0))
+				return HookResult.Continue;
+					
+			@event.Musickitid = musicId;
+			@event.Nomusic = 0;
+			info.DontBroadcast = true;
+			
+			var newEvent = new EventRoundMvp(true)
+			{
+				Userid = player,
+				Musickitid = musicId,
+				Nomusic = 0,
+			};
+
+			_mvpPlayed = true;
+			
+			newEvent.FireEvent(false);
 			return HookResult.Continue;
 		}
 
@@ -289,6 +324,7 @@ namespace WeaponPaints
 			RegisterEventHandler<EventPlayerSpawn>(OnPlayerSpawn);
 			RegisterEventHandler<EventRoundStart>(OnRoundStart);
 			RegisterEventHandler<EventRoundEnd>(OnRoundEnd);
+			RegisterEventHandler<EventRoundMvp>(OnRoundMvp);
 			RegisterListener<Listeners.OnEntityCreated>(OnEntityCreated);
 			RegisterEventHandler<EventPlayerDeath>(OnPlayerDeath);
 

WeaponAction.cs

@@ -172,10 +172,10 @@ namespace WeaponPaints
 				// 	$"sticker slot {stickerSlot} schema", stickerSlot);
 				// if (stickerSlot == 5)
 				// {
-				// 	// CAttributeListSetOrAddAttributeValueByName.Invoke(weapon.AttributeManager.Item.NetworkedDynamicAttributes.Handle,
+				CAttributeListSetOrAddAttributeValueByName.Invoke(weapon.AttributeManager.Item.NetworkedDynamicAttributes.Handle,
-				// 	// 	$"sticker slot {stickerSlot} offset x", 0.05f);
+					$"sticker slot {stickerSlot} offset x", sticker.OffsetX);
-				// 	// CAttributeListSetOrAddAttributeValueByName.Invoke(weapon.AttributeManager.Item.NetworkedDynamicAttributes.Handle,
+				CAttributeListSetOrAddAttributeValueByName.Invoke(weapon.AttributeManager.Item.NetworkedDynamicAttributes.Handle,
-				// 	// 	$"sticker slot {stickerSlot} offset y", 0.02f);
+					$"sticker slot {stickerSlot} offset y", sticker.OffsetY);
 				// }
 				CAttributeListSetOrAddAttributeValueByName.Invoke(weapon.AttributeManager.Item.NetworkedDynamicAttributes.Handle,
 					$"sticker slot {stickerSlot} wear", sticker.Wear);