SpigotMC/Saber-Factions
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add password protected warps

Browse Source
This commit is contained in:
Trent Hensler
2017-12-19 02:10:52 -08:00
parent 18749dcb06
commit ce132ed033
5 changed files with 41 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/massivecraft/factions/cmd/CmdFWarp.java
View File

@@ -22,6 +22,7 @@ public class CmdFWarp extends FCommand {
this.aliases.add("warp");
this.aliases.add("warps");
this.optionalArgs.put("warpname", "warpname");
this.optionalArgs.put("password", "password");
this.permission = Permission.WARP.node;
this.senderMustBeMember = true;
@@ -38,11 +39,21 @@ public class CmdFWarp extends FCommand {
msg.then(s + " ").tooltip(TL.COMMAND_FWARP_CLICKTOWARP.toString()).command("/" + Conf.baseCommandAliases.get(0) + " warp " + s).color(ChatColor.WHITE);
}
sendFancyMessage(msg);
} else if (args.size() > 1) {
} else if (args.size() > 2) {
fme.msg(TL.COMMAND_FWARP_COMMANDFORMAT);
} else {
final String warpName = argAsString(0);
final String passwordAttempt = argAsString(1);
if (myFaction.isWarp(argAsString(0))) {
// Check if requires password and if so, check if valid. CASE SENSITIVE
if (myFaction.hasWarpPassword(warpName) && !myFaction.isWarpPassword(warpName, passwordAttempt)) {
fme.msg(TL.COMMAND_FWARP_INVALID_PASSWORD);
return;
}
// Check transaction AFTER password check.
if (!transact(fme)) {
return;
}

8
src/main/java/com/massivecraft/factions/cmd/CmdSetFWarp.java
View File

@@ -14,6 +14,7 @@ public class CmdSetFWarp extends FCommand {
this.aliases.add("setwarp");
this.aliases.add("sw");
this.requiredArgs.add("warp name");
this.optionalArgs.put("password", "password");
this.senderMustBeMember = true;
this.senderMustBeModerator = true;
this.senderMustBePlayer = true;
@@ -38,9 +39,14 @@ public class CmdSetFWarp extends FCommand {
}
String warp = argAsString(0);
String password = argAsString(1);
LazyLocation loc = new LazyLocation(fme.getPlayer().getLocation());
myFaction.setWarp(warp, loc);
fme.msg(TL.COMMAND_SETFWARP_SET, warp);
if (password != null) {
myFaction.setWarpPassword(warp, password);
}
fme.msg(TL.COMMAND_SETFWARP_SET, warp, password != null ? password : "");
}
private boolean transact(FPlayer player) {