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

More reformatting

Browse Source
This commit is contained in:
drtshock
2014-07-01 14:52:40 -05:00
parent dc54f78cc1
commit 5066934a95
109 changed files with 1288 additions and 2883 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/main/java/com/massivecraft/factions/cmd/CmdClaim.java
View File

@@ -10,42 +10,32 @@ import com.massivecraft.factions.util.SpiralTask;
public class CmdClaim extends FCommand {
public CmdClaim() {
super();
this.aliases.add("claim");
super(); this.aliases.add("claim");
//this.requiredArgs.add("");
this.optionalArgs.put("faction", "your");
this.optionalArgs.put("radius", "1");
this.optionalArgs.put("faction", "your"); this.optionalArgs.put("radius", "1");
this.permission = Permission.CLAIM.node;
this.disableOnLock = true;
this.permission = Permission.CLAIM.node; this.disableOnLock = true;
senderMustBePlayer = true;
senderMustBeMember = false;
senderMustBeModerator = false;
senderMustBeAdmin = false;
senderMustBePlayer = true; senderMustBeMember = false; senderMustBeModerator = false; senderMustBeAdmin = false;
}
@Override
public void perform() {
// Read and validate input
final Faction forFaction = this.argAsFaction(0, myFaction);
int radius = this.argAsInt(1, 1);
final Faction forFaction = this.argAsFaction(0, myFaction); int radius = this.argAsInt(1, 1);
if (radius < 1) {
msg("<b>If you specify a radius, it must be at least 1.");
return;
msg("<b>If you specify a radius, it must be at least 1."); return;
}
if (radius < 2) {
// single chunk
fme.attemptClaim(forFaction, me.getLocation(), true);
}
else {
} else {
// radius claim
if (!Permission.CLAIM_RADIUS.has(sender, false)) {
msg("<b>You do not have permission to claim in a radius.");
return;
msg("<b>You do not have permission to claim in a radius."); return;
}
new SpiralTask(new FLocation(me), radius) {
@@ -55,10 +45,8 @@ public class CmdClaim extends FCommand {
@Override
public boolean work() {
boolean success = fme.attemptClaim(forFaction, this.currentLocation(), true);
if (success) { failCount = 0; }
else if (!success && failCount++ >= limit) {
this.stop();
return false;
if (success) { failCount = 0; } else if (!success && failCount++ >= limit) {
this.stop(); return false;
}
return true;