From af71c00fad111c66088970f8f5a9534d479a8d82 Mon Sep 17 00:00:00 2001 From: Unbistrackted <112902220+Unbistrackted@users.noreply.github.com> Date: Wed, 4 Mar 2026 05:54:45 -0300 Subject: [PATCH] chore(callvote): use Callvote.API instead --- .../CallvoteMethods/StartVoteAndWaitMethod.cs | 13 ++++++------- .../Methods/CallvoteMethods/StartVoteMethod.cs | 11 +++++------ SER.csproj | 4 +++- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Code/MethodSystem/Methods/CallvoteMethods/StartVoteAndWaitMethod.cs b/Code/MethodSystem/Methods/CallvoteMethods/StartVoteAndWaitMethod.cs index 8349558..3d959de 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; @@ -118,12 +116,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 77fa6a7..1b8e055 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; @@ -45,12 +43,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 @@ -