Merge pull request #206 from SavageLLC/minorfixes

Fixes #205 and /f seepaypal

Author: prosavage

src/main/java/com/massivecraft/factions/cmd/CmdPaypalSee.java

@@ -8,7 +8,7 @@
 public class CmdPaypalSee extends FCommand {
     public CmdPaypalSee() {
         aliases.add("seepaypal");
-        requiredArgs.add("faction");
+        optionalArgs.put("faction", "your");
 
         this.requirements = new CommandRequirements.Builder(Permission.ADMIN)
                 .build();
@@ -20,12 +20,12 @@ public void perform(CommandContext context) {
             context.msg(TL.GENERIC_DISABLED);
             return;
         }
-        Faction faction = context.argAsFaction(0);
+        Faction faction = context.argIsSet(0) ? context.argAsFaction(0) : context.fPlayer.getFaction();
 
         if (faction == null)
             return;
 
-        if (!faction.isWilderness() && !faction.isSafeZone() && !faction.isWarZone()) {
+        if (faction.isWilderness() || faction.isSafeZone() || faction.isWarZone()) {
             context.msg(TL.COMMAND_PAYPALSEE_FACTION_NOFACTION.toString(), context.player.getName());
             return;
         }

src/main/java/com/massivecraft/factions/cmd/CmdUnclaim.java

@@ -52,7 +52,7 @@ public void perform(CommandContext context) {
 
                 @Override
                 public boolean work() {
-                    boolean success = unClaim(new FLocation(context.player), context);
+                    boolean success = unClaim(currentFLocation(), context);
                     if (success) {
                         failCount = 0;
                     } else if (failCount++ >= limit) {

src/main/java/com/massivecraft/factions/zcore/persist/MemoryFPlayer.java

@@ -794,8 +794,6 @@ public boolean canClaimForFactionAtLocation(Faction forFaction, FLocation flocat
             error = SavageFactions.plugin.txt.parse(TL.CLAIM_CANTCLAIM.toString(), forFaction.describeTo(this));
         } else if (forFaction == currentFaction) {
             error = SavageFactions.plugin.txt.parse(TL.CLAIM_ALREADYOWN.toString(), forFaction.describeTo(this, true));
-        } else if (this.getRole().value < Role.MODERATOR.value) {
-            error = SavageFactions.plugin.txt.parse(TL.CLAIM_MUSTBE.toString(), Role.MODERATOR.getTranslation());
         } else if (forFaction.getFPlayers().size() < Conf.claimsRequireMinFactionMembers) {
             error = SavageFactions.plugin.txt.parse(TL.CLAIM_MEMBERS.toString(), Conf.claimsRequireMinFactionMembers);
         } else if (currentFaction.isSafeZone()) {