Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Merge branch 'Patron' into ToPatron
  • Loading branch information
N1Ran authored Feb 9, 2019
commit 77dc0546260a97a5faa3152b9183040d93fcb60f
6 changes: 4 additions & 2 deletions Essentials/Commands/VotingModule.cs
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,7 @@ private IEnumerable VoteCountdown(TimeSpan time)
.SendMessageAsSelf($"Vote for {voteInProgress} cancelled");
voteResult = Status.voteCancel;
VoteEnd();

yield break;
}

Expand All @@ -238,7 +239,6 @@ private IEnumerable VoteCountdown(TimeSpan time)
else
{
var _votePercent = 100 * (_voteReg.Count / MySession.Static.Players.GetOnlinePlayerCount());

if (_votePercent >= command.Percentage)
{
Context.Torch.CurrentSession.Managers.GetManager<IChatManagerClient>()
Expand All @@ -254,13 +254,15 @@ private IEnumerable VoteCountdown(TimeSpan time)
}
voteResultPercentage = _votePercent;
VoteEnd();

yield break;
}
}
}

public void VoteEnd()
{

//Make sure it's all good for next round
VoteStatus = Status.voteStandby;
voteInProgress = null;
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.