Skip to content

wrong branch pull request. Patron testing only. N1 fuckery #68

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
N1Ran wants to merge 5 commits into from
Closed

wrong branch pull request. Patron testing only. N1 fuckery #68

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b668ce9
Added admin command for power on/off to grids, player kill, stopall g…
N1Ran Jan 19, 2019
d42effc
little tweaks here and there to refine the code
N1Ran Jan 19, 2019
1331a7d
Vote system fully functional
N1Ran Jan 20, 2019
3f38e66
More tweaks here and there
N1Ran Jan 20, 2019
df0f3cf
much better
N1Ran Jan 20, 2019
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
much better
  • Loading branch information
@N1Ran
N1Ran committed Jan 20, 2019
commit df0f3cfaa6e613655e7cf49cffcdda7ae2400eae
14 changes: 4 additions & 10 deletions Essentials/Commands/VotingModule.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,20 +41,15 @@ public void Vote(string name)
return;
}

if (command == null)
if (command == null || !command.Votable)
{
Context.Respond($"Couldn't find an auto command with the name {name}");
Context.Respond($"Couldn't find any votable command with the name '{name}'");
return;
}

if (Context.Player == null)
return;

if (!command.Votable)
{
Context.Respond($"{name} is not set for voting.");
return;
}
var steamid = Context.Player.SteamUserId;

// Rexxar's spam blocker
Expand Down Expand Up @@ -102,9 +97,8 @@ public void Vote(string name)
_voteInProgress = true;
if (_voteDuration.TotalSeconds > 10)
{
Context.Torch.CurrentSession?.Managers?.GetManager<IChatManagerServer>()?.SendMessageAsSelf($"Voting started for {name}. " +
$"use '!yes' to vote and '!no' to retract your vote " +
$"voting ends in {_voteDuration.Minutes:N0} minutes : {_voteDuration.Seconds:N0} seconds. ");
Context.Torch.CurrentSession?.Managers?.GetManager<IChatManagerServer>()?.SendMessageAsSelf($"Voting started for {name} by {Context.Player.DisplayName}. " +
$"Use '!yes' to vote and '!no' to retract your vote");
}

//vote countdown
Expand Down