EpicKnarvik97/Jail
EpicKnarvik97/Jail
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Don't allow jail vote for people not online and players with permission

Browse Source 
which disallows them being jailed.
This commit is contained in:
graywolf336 2015-02-12 23:37:05 -06:00
parent d205a35d0a
commit 64f6ce8a64
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/com/graywolf336/jail/command/subcommands/JailVoteCommand.java
View File

@ -38,17 +38,26 @@ public class JailVoteCommand implements Command {
} }
} }
}else if(sender.hasPermission("jail.vote.start")) { }else if(sender.hasPermission("jail.vote.start")) {
jvm.addVote(new JailVote(args[1])); Player voteAgainst = jm.getPlugin().getServer().getPlayer(args[1]);
jvm.addVote(args[1], p.getUniqueId(), true); if(voteAgainst == null) {
sender.sendMessage(Lang.PLAYERNOTONLINE.get());
}else {
if(voteAgainst.hasPermission("jail.cantbejailed")) {
sender.sendMessage(Lang.CANTBEJAILED.get());
}else {
jvm.addVote(new JailVote(voteAgainst.getName()));
jvm.addVote(voteAgainst.getName(), p.getUniqueId(), true);
jm.getPlugin().getServer().broadcastMessage(Lang.VOTEBROADCASTHEADER.get()); jm.getPlugin().getServer().broadcastMessage(Lang.VOTEBROADCASTHEADER.get());
jm.getPlugin().getServer().broadcastMessage(Lang.VOTEBROADCASTLINE1.get(new String[] { sender.getName(), args[1] })); jm.getPlugin().getServer().broadcastMessage(Lang.VOTEBROADCASTLINE1.get(new String[] { sender.getName(), args[1] }));
jm.getPlugin().getServer().broadcastMessage(Lang.VOTEBROADCASTLINE2.get(args[1])); jm.getPlugin().getServer().broadcastMessage(Lang.VOTEBROADCASTLINE2.get(voteAgainst.getName()));
jm.getPlugin().getServer().broadcastMessage(Lang.VOTEBROADCASTLINE3.get(args[1])); jm.getPlugin().getServer().broadcastMessage(Lang.VOTEBROADCASTLINE3.get(voteAgainst.getName()));
jm.getPlugin().getServer().broadcastMessage(Lang.VOTEBROADCASTLINE4.get(jvm.getTimerLengthDescription())); jm.getPlugin().getServer().broadcastMessage(Lang.VOTEBROADCASTLINE4.get(jvm.getTimerLengthDescription()));
jm.getPlugin().getServer().broadcastMessage(Lang.VOTEBROADCASTFOOTER.get()); jm.getPlugin().getServer().broadcastMessage(Lang.VOTEBROADCASTFOOTER.get());
jvm.scheduleCalculating(args[1]); jvm.scheduleCalculating(args[1]);
}
}
}else { }else {
jm.getPlugin().debug(sender.getName() + " tried to start a vote to jail someone but didn't have permission, jail.vote.start"); jm.getPlugin().debug(sender.getName() + " tried to start a vote to jail someone but didn't have permission, jail.vote.start");
sender.sendMessage(Lang.VOTENOPERMISSIONTOSTART.get(args[1])); sender.sendMessage(Lang.VOTENOPERMISSIONTOSTART.get(args[1]));

2
src/main/resources/en.yml
View File

@ -97,7 +97,7 @@ language:
paidloweredtimeelse: "&2You have just payed %0% and lowered %1%'s sentence to %2% minutes!" paidloweredtimeelse: "&2You have just payed %0% and lowered %1%'s sentence to %2% minutes!"
jailvote: jailvote:
broadcast: broadcast:
header: "&3------------ Jail -----------" header: "&3------------- Jail ------------"
line1: "&a%0% &bhas voted that &c%1% &bshould be jailed." line1: "&a%0% &bhas voted that &c%1% &bshould be jailed."
line2: "&6Type &a/jail vote %0% yes &6if you agree" line2: "&6Type &a/jail vote %0% yes &6if you agree"
line3: "&6or type &a/jail vote %0% no &6if you disagree." line3: "&6or type &a/jail vote %0% no &6if you disagree."