From 3543030e648297a30d3cecf01f65deb3779a1c65 Mon Sep 17 00:00:00 2001
From: ProSavage <naman0311@gmail.com>
Date: Tue, 17 Jul 2018 09:26:25 -0500
Subject: [PATCH] /f tnt withdraw issue fix.

---
 .../com/massivecraft/factions/cmd/CmdTnt.java | 40 ++++++++++---------
 .../massivecraft/factions/zcore/util/TL.java  |  3 ++
 2 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdTnt.java b/src/main/java/com/massivecraft/factions/cmd/CmdTnt.java
index 0f7c80d7..66e8c443 100644
--- a/src/main/java/com/massivecraft/factions/cmd/CmdTnt.java
+++ b/src/main/java/com/massivecraft/factions/cmd/CmdTnt.java
@@ -2,6 +2,7 @@ package com.massivecraft.factions.cmd;
 
 import com.massivecraft.factions.P;
 import com.massivecraft.factions.struct.Permission;
+import com.massivecraft.factions.struct.Role;
 import com.massivecraft.factions.zcore.fperms.Access;
 import com.massivecraft.factions.zcore.fperms.PermissableAction;
 import com.massivecraft.factions.zcore.util.TL;
@@ -9,7 +10,6 @@ import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.PlayerInventory;
 
 public class CmdTnt extends FCommand {
     public CmdTnt() {
@@ -37,13 +37,14 @@ public class CmdTnt extends FCommand {
         }
 
         Access access = fme.getFaction().getAccess(fme, PermissableAction.TNTBANK);
-        if (access.equals(Access.DENY)) {
+        if (access != Access.ALLOW && fme.getRole() != Role.ADMIN) {
             fme.msg(TL.GENERIC_NOPERMISSION, "tntbank");
+            return;
         }
 
 
         if (args.size() == 2) {
-            if (args.get(0).equalsIgnoreCase("add")) {
+            if (args.get(0).equalsIgnoreCase("add") || args.get(0).equalsIgnoreCase("a")) {
                 int testNumber = -1;
                 try {
                     testNumber = Integer.parseInt(args.get(1));
@@ -84,7 +85,7 @@ public class CmdTnt extends FCommand {
                 return;
 
             }
-            if (args.get(0).equalsIgnoreCase("take")) {
+            if (args.get(0).equalsIgnoreCase("take") || args.get(0).equalsIgnoreCase("t")) {
                 int testNumber = -1;
                 try {
                     testNumber = Integer.parseInt(args.get(1));
@@ -103,12 +104,12 @@ public class CmdTnt extends FCommand {
                 }
                 int fullStacks = amount / 64;
                 int remainderAmt = amount % 64;
-                if ((remainderAmt == 0 && getEmptySlots(me) <= fullStacks)) {
-                    fme.msg(TL.COMMAND_TNT_WIDTHDRAW_NOTENOUGH);
+                if ((remainderAmt == 0 && !hasAvaliableSlot(me, fullStacks))) {
+                    fme.msg(TL.COMMAND_TNT_WIDTHDRAW_NOTENOUGH_SPACE);
                     return;
                 }
-                if (getEmptySlots(me) + 1 <= fullStacks) {
-                    fme.msg(TL.COMMAND_TNT_WIDTHDRAW_NOTENOUGH);
+                if (hasAvaliableSlot(me, fullStacks + 1)) {
+                    fme.msg(TL.COMMAND_TNT_WIDTHDRAW_NOTENOUGH_SPACE);
                     return;
                 }
                 ItemStack tnt64 = new ItemStack(Material.TNT, 64);
@@ -123,6 +124,9 @@ public class CmdTnt extends FCommand {
                 me.updateInventory();
                 fme.msg(TL.COMMAND_TNT_WIDTHDRAW_SUCCESS);
             }
+        } else if (args.size() == 1) {
+            fme.msg(TL.GENERIC_ARGS_TOOFEW);
+            fme.msg(args.get(0).equalsIgnoreCase("take") || args.get(0).equalsIgnoreCase("t") ? TL.COMMAND_TNT_TAKE_DESCRIPTION : TL.COMMAND_TNT_ADD_DESCRIPTION);
         }
         fme.sendMessage(TL.COMMAND_TNT_AMOUNT.toString().replace("{amount}", fme.getFaction().getTnt() + ""));
     }
@@ -142,6 +146,15 @@ public class CmdTnt extends FCommand {
         return false;
     }
 
+    public boolean hasAvaliableSlot(Player player, int howmany) {
+        Integer check = 0;
+        for (ItemStack item : player.getInventory().getContents()) {
+            if (item == null) {
+                check++;
+            }
+        }
+        return check >= howmany;
+    }
 
     public void removeFromInventory(Inventory inventory, ItemStack item) {
         int amt = item.getAmount();
@@ -163,17 +176,6 @@ public class CmdTnt extends FCommand {
         inventory.setContents(items);
     }
 
-    public int getEmptySlots(Player p) {
-        PlayerInventory inventory = p.getInventory();
-        ItemStack[] cont = inventory.getContents();
-        int i = 0;
-        for (ItemStack item : cont)
-            if (item != null && item.getType() != Material.AIR) {
-                i++;
-            }
-        return 36 - i;
-    }
-
     @Override
     public TL getUsageTranslation() {
         return TL.COMMAND_TNT_DESCRIPTION;
diff --git a/src/main/java/com/massivecraft/factions/zcore/util/TL.java b/src/main/java/com/massivecraft/factions/zcore/util/TL.java
index fce3a66c..8d608f66 100644
--- a/src/main/java/com/massivecraft/factions/zcore/util/TL.java
+++ b/src/main/java/com/massivecraft/factions/zcore/util/TL.java
@@ -677,6 +677,9 @@ public enum TL {
     COMMAND_TNT_AMOUNT("&cYour faction has {amount} tnt in the tnt bank."),
     COMMAND_TNT_POSITIVE("&cPlease use positive numbers!"),
     COMMAND_TNT_DESCRIPTION("add/widthraw from faction's tnt bank"),
+    COMMAND_TNT_WIDTHDRAW_NOTENOUGH_SPACE("&cNot enough space in your inventory."),
+    COMMAND_TNT_ADD_DESCRIPTION("&b/f tnt add&3 <amount>"),
+    COMMAND_TNT_TAKE_DESCRIPTION("&b/f tnt take&3 <amount>"),
 
     COMMAND_TNTFILL_HEADER("&c&l[!] &7Filling tnt in dispensers..."),
     COMMAND_TNTFILL_SUCCESS("&c&l[!] &7Filled &c{amount}&7 Tnt in &c{dispensers} &7dispensers"),