From 6cd2a80c36f97db54bbc83928a9e4a86693b278f Mon Sep 17 00:00:00 2001
From: Driftay <saser_elite@yahoo.com>
Date: Sat, 23 Mar 2019 02:02:46 -0400
Subject: [PATCH] Fixed F PayPal

---
 .../factions/cmd/CmdPaypalSee.java            | 23 +++++++++++--------
 .../factions/cmd/CmdPaypalSet.java            | 21 +++++++++--------
 2 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdPaypalSee.java b/src/main/java/com/massivecraft/factions/cmd/CmdPaypalSee.java
index 29a789fe..c7b77cb5 100644
--- a/src/main/java/com/massivecraft/factions/cmd/CmdPaypalSee.java
+++ b/src/main/java/com/massivecraft/factions/cmd/CmdPaypalSee.java
@@ -8,9 +8,11 @@ import com.massivecraft.factions.zcore.util.TL;
 public class CmdPaypalSee extends FCommand {
 	public CmdPaypalSee() {
 		aliases.add("seepaypal");
-		aliases.add("getpaypal");
+
 		requiredArgs.add("faction");
+
 		permission = Permission.ADMIN.node;
+
 		disableOnLock = false;
 		senderMustBePlayer = false;
 		senderMustBeMember = false;
@@ -19,28 +21,29 @@ public class CmdPaypalSee extends FCommand {
 		senderMustBeAdmin = false;
 
 	}
-
+   	@Override
 	public void perform() {
 		if (!SavageFactions.plugin.getConfig().getBoolean("fpaypal.Enabled")) {
 			fme.msg(TL.GENERIC_DISABLED);
-		} else {
+			return;
+		}
 			Faction faction = argAsFaction(0);
 
-			if (faction != null) {
+			if (faction != null)
+				return;
+
 				if (!faction.isWilderness() && !faction.isSafeZone() && !faction.isWarZone()) {
+					fme.msg(TL.COMMAND_PAYPALSEE_FACTION_NOFACTION.toString(), me.getName());
+					return;
+				}
 					if (faction.getPaypal() != null) {
 						fme.msg(TL.COMMAND_PAYPALSEE_FACTION_PAYPAL.toString(), faction.getTag(), faction.getPaypal());
 					} else {
 						fme.msg(TL.COMMAND_PAYPALSEE_FACTION_NOTSET.toString(), faction.getTag(), faction.getPaypal());
 					}
-
-				} else {
-					fme.msg(TL.COMMAND_PAYPALSEE_FACTION_NOFACTION.toString(), me.getName());
 				}
-			}
-		}
-	}
 
+	@Override
 	public TL getUsageTranslation() {
 		return TL.COMMAND_PAYPALSEE_DESCRIPTION;
 	}
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdPaypalSet.java b/src/main/java/com/massivecraft/factions/cmd/CmdPaypalSet.java
index 02b1b3a4..b0efece7 100644
--- a/src/main/java/com/massivecraft/factions/cmd/CmdPaypalSet.java
+++ b/src/main/java/com/massivecraft/factions/cmd/CmdPaypalSet.java
@@ -8,30 +8,31 @@ public class CmdPaypalSet extends FCommand {
 
 	public CmdPaypalSet() {
 		this.aliases.add("setpaypal");
-		this.aliases.add("paypal");
 		this.requiredArgs.add("email");
 		this.permission = Permission.PAYPALSET.node;
 		this.disableOnLock = false;
 		this.senderMustBePlayer = true;
 		this.senderMustBeMember = false;
 		this.senderMustBeModerator = false;
-		this.senderMustBeColeader = true;
-		this.senderMustBeAdmin = false;
+		this.senderMustBeColeader = false;
+		this.senderMustBeAdmin = true;
 
 	}
-
+	@Override
 	public void perform() {
 		if (!SavageFactions.plugin.getConfig().getBoolean("fpaypal.Enabled")) {
 			fme.msg(TL.GENERIC_DISABLED);
-		} else {
-			String paypal = argAsString(0);
-			if (paypal != null) {
-				myFaction.paypalSet(paypal);
-				fme.msg(TL.COMMAND_PAYPALSET_SUCCESSFUL, paypal);
-			}
+			return;
 		}
+
+		String paypal = this.argAsString(0);
+		if(paypal == null)
+			return;
+		myFaction.paypalSet(paypal);
+		fme.msg(TL.COMMAND_PAYPALSET_SUCCESSFUL, paypal);
 	}
 
+	@Override
 	public TL getUsageTranslation() {
 		return TL.COMMAND_PAYPALSET_DESCRIPTION;
 	}