diff --git a/code/Entities/MinigameManager.cs b/code/Entities/MinigameManager.cs index a9f6650..73f1fcf 100644 --- a/code/Entities/MinigameManager.cs +++ b/code/Entities/MinigameManager.cs @@ -13,7 +13,7 @@ namespace LuckerGame.Entities; public partial class MinigameManager : Entity { [Net] public Minigame LoadedMinigame { get; private set; } - private List AvailableMinigames { get; set; } + private List AvailableMinigames { get; set; } private List InvolvedPlayers { get; set; } public override void Spawn() @@ -27,7 +27,7 @@ public partial class MinigameManager : Entity InvolvedPlayers = players.ToList(); if (CheckForMinigames()) { - LoadedMinigame = string.IsNullOrEmpty( minigameName ) ? AvailableMinigames.OrderBy( _ => Guid.NewGuid() ).FirstOrDefault() : TypeLibrary.Create( minigameName ); + LoadedMinigame = string.IsNullOrEmpty( minigameName ) ? TypeLibrary.Create(AvailableMinigames.OrderBy( _ => Guid.NewGuid() ).FirstOrDefault().TargetType) : TypeLibrary.Create( minigameName ); ChatBox.AddInformation( To.Everyone, $"Starting {LoadedMinigame.Name}" ); LoadedMinigame.Initialize( players ); } @@ -48,7 +48,7 @@ public partial class MinigameManager : Entity { AvailableMinigames = TypeLibrary.GetTypes() .Where( type => !type.IsAbstract && !type.IsInterface ) - .Select( td => TypeLibrary.Create( td.TargetType ) ).ToList(); + .ToList(); } [Event.Hotload] diff --git a/code/Minigames/RussianRoulette/RussianRouletteMinigame.cs b/code/Minigames/RussianRoulette/RussianRouletteMinigame.cs index 52885bf..7ca3eed 100644 --- a/code/Minigames/RussianRoulette/RussianRouletteMinigame.cs +++ b/code/Minigames/RussianRoulette/RussianRouletteMinigame.cs @@ -61,6 +61,7 @@ public class RussianRouletteMinigame : Minigame pawn.LookAt(Shooter.Position); } ); TimeSinceShot = 0; + Taunted = 0; } public override bool Tick()