From 6f50c4e680611488b8487128058431ff7505c454 Mon Sep 17 00:00:00 2001
From: Driftay <saser_elite@yahoo.com>
Date: Tue, 6 Aug 2019 19:39:20 -0400
Subject: [PATCH] Made Giving F Points Player Supported Too

---
 .../factions/cmd/points/CmdPointsAdd.java             | 11 +++++++++--
 .../factions/cmd/points/CmdPointsRemove.java          | 11 +++++++++--
 .../factions/cmd/points/CmdPointsSet.java             | 10 ++++++++--
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/massivecraft/factions/cmd/points/CmdPointsAdd.java b/src/main/java/com/massivecraft/factions/cmd/points/CmdPointsAdd.java
index 613140e8..c5cc2013 100644
--- a/src/main/java/com/massivecraft/factions/cmd/points/CmdPointsAdd.java
+++ b/src/main/java/com/massivecraft/factions/cmd/points/CmdPointsAdd.java
@@ -1,5 +1,7 @@
 package com.massivecraft.factions.cmd.points;
 
+import com.massivecraft.factions.FPlayer;
+import com.massivecraft.factions.FPlayers;
 import com.massivecraft.factions.Faction;
 import com.massivecraft.factions.Factions;
 import com.massivecraft.factions.cmd.FCommand;
@@ -12,7 +14,7 @@ public class CmdPointsAdd extends FCommand {
         super();
         this.aliases.add("add");
 
-        this.requiredArgs.add("faction");
+        this.requiredArgs.add("faction/player");
         this.requiredArgs.add("# of points");
 
 
@@ -35,7 +37,12 @@ public class CmdPointsAdd extends FCommand {
     public void perform() {
         Faction faction = Factions.getInstance().getByTag(args.get(0));
 
-        if (faction == null) {
+        FPlayer fPlayer = this.argAsFPlayer(0);
+        if (fPlayer != null) {
+            faction = fPlayer.getFaction();
+        }
+
+        if (faction == null || faction.isWilderness()) {
             fme.msg(TL.COMMAND_POINTS_FAILURE.toString().replace("{faction}", args.get(0)));
             return;
         }
diff --git a/src/main/java/com/massivecraft/factions/cmd/points/CmdPointsRemove.java b/src/main/java/com/massivecraft/factions/cmd/points/CmdPointsRemove.java
index a814f419..d552f25a 100644
--- a/src/main/java/com/massivecraft/factions/cmd/points/CmdPointsRemove.java
+++ b/src/main/java/com/massivecraft/factions/cmd/points/CmdPointsRemove.java
@@ -1,5 +1,6 @@
 package com.massivecraft.factions.cmd.points;
 
+import com.massivecraft.factions.FPlayer;
 import com.massivecraft.factions.Faction;
 import com.massivecraft.factions.Factions;
 import com.massivecraft.factions.cmd.FCommand;
@@ -12,7 +13,7 @@ public class CmdPointsRemove extends FCommand {
         super();
         this.aliases.add("remove");
 
-        this.requiredArgs.add("faction");
+        this.requiredArgs.add("faction/player");
         this.requiredArgs.add("# of points");
 
 
@@ -35,7 +36,13 @@ public class CmdPointsRemove extends FCommand {
     public void perform() {
         Faction faction = Factions.getInstance().getByTag(args.get(0));
 
-        if (faction == null) {
+
+        FPlayer fPlayer = this.argAsFPlayer(0);
+        if (fPlayer != null) {
+            faction = fPlayer.getFaction();
+        }
+
+        if (faction == null || faction.isWilderness()) {
             fme.msg(TL.COMMAND_POINTS_FAILURE.toString().replace("{faction}", args.get(0)));
             return;
         }
diff --git a/src/main/java/com/massivecraft/factions/cmd/points/CmdPointsSet.java b/src/main/java/com/massivecraft/factions/cmd/points/CmdPointsSet.java
index 4277782c..dd1de638 100644
--- a/src/main/java/com/massivecraft/factions/cmd/points/CmdPointsSet.java
+++ b/src/main/java/com/massivecraft/factions/cmd/points/CmdPointsSet.java
@@ -1,5 +1,6 @@
 package com.massivecraft.factions.cmd.points;
 
+import com.massivecraft.factions.FPlayer;
 import com.massivecraft.factions.Faction;
 import com.massivecraft.factions.Factions;
 import com.massivecraft.factions.cmd.FCommand;
@@ -12,7 +13,7 @@ public class CmdPointsSet extends FCommand {
         super();
         this.aliases.add("set");
 
-        this.requiredArgs.add("faction");
+        this.requiredArgs.add("faction/player");
         this.requiredArgs.add("# of points");
 
 
@@ -35,7 +36,12 @@ public class CmdPointsSet extends FCommand {
     public void perform() {
         Faction faction = Factions.getInstance().getByTag(args.get(0));
 
-        if (faction == null) {
+        FPlayer fPlayer = this.argAsFPlayer(0);
+        if (fPlayer != null) {
+            faction = fPlayer.getFaction();
+        }
+
+        if (faction == null || faction.isWilderness()) {
             fme.msg(TL.COMMAND_POINTS_FAILURE.toString().replace("{faction}", args.get(0)));
             return;
         }