diff --git a/Code/MethodSystem/Methods/CallvoteMethods/StartVoteAndWaitMethod.cs b/Code/MethodSystem/Methods/CallvoteMethods/StartVoteAndWaitMethod.cs index a309c97..da3b7ad 100644 --- a/Code/MethodSystem/Methods/CallvoteMethods/StartVoteAndWaitMethod.cs +++ b/Code/MethodSystem/Methods/CallvoteMethods/StartVoteAndWaitMethod.cs @@ -1,6 +1,4 @@ -using Callvote.API; -using Callvote.API.VoteTemplate; -using Callvote.Features; +using Callvote.API.Features.Votes; using JetBrains.Annotations; using LabApi.Features.Wrappers; using MEC; @@ -119,12 +117,13 @@ private static void RunSafeVote( voteOptions.Add(new VoteOption(o.Option, o.DisplayText)); } - var voting = new CustomVote( - Server.Host!, + var voting = new Vote( + Server.Host.ReferenceHub!, question, $"SER.{question}", - VoteCallback, - voteOptions + callback: VoteCallback, + voteOptions, + Player.ReadyList.Select(p => p.ReferenceHub).ToHashSet() ); VoteHandler.CallVote(voting); diff --git a/Code/MethodSystem/Methods/CallvoteMethods/StartVoteMethod.cs b/Code/MethodSystem/Methods/CallvoteMethods/StartVoteMethod.cs index 8a1b393..abbf62b 100644 --- a/Code/MethodSystem/Methods/CallvoteMethods/StartVoteMethod.cs +++ b/Code/MethodSystem/Methods/CallvoteMethods/StartVoteMethod.cs @@ -1,6 +1,4 @@ -using Callvote.API; -using Callvote.API.VoteTemplate; -using Callvote.Features; +using Callvote.API.Features.Votes; using JetBrains.Annotations; using LabApi.Features.Wrappers; using SER.Code.ArgumentSystem.Arguments; @@ -46,12 +44,13 @@ public override void Execute() voteOptions.Add(new VoteOption(o.Option, o.DisplayText)); } - var voting = new CustomVote( - Server.Host!, + var voting = new Vote( + Server.Host.ReferenceHub!, question, $"SER.{question}", null, - voteOptions + voteOptions, + Player.ReadyList.Select(p => p.ReferenceHub).ToHashSet() ); VoteHandler.CallVote(voting); diff --git a/SER.csproj b/SER.csproj index f2f730f..5d4444c 100644 --- a/SER.csproj +++ b/SER.csproj @@ -58,6 +58,9 @@ $(SL_DEV_REFERENCES)\Pooling.dll + + $(SL_DEV_REFERENCES)\Callvote.API.dll + $(SL_DEV_REFERENCES)\UnityEngine.dll @@ -106,7 +109,6 @@ -