Fixed all errors with Sevenja's new commits

prosavage · prosavage · commit d0cf88c9c6b5 · 2018-08-04T20:32:36.000-05:00
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdBan.java b/src/main/java/com/massivecraft/factions/cmd/CmdBan.java
@@ -33,11 +33,6 @@ public CmdBan() {
 
     @Override
     public void perform() {
-        Access access = myFaction.getAccess(fme, PermissableAction.BAN);
-        if (access == Access.DENY) {
-            fme.msg(TL.GENERIC_NOPERMISSION, "ban");
-            return;
-        }
 
         // Adds bypass to admins and clean permission check
         if (!fme.isAdminBypassing()) {
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdChat.java b/src/main/java/com/massivecraft/factions/cmd/CmdChat.java
@@ -3,6 +3,7 @@
 import com.massivecraft.factions.Conf;
 import com.massivecraft.factions.struct.ChatMode;
 import com.massivecraft.factions.struct.Permission;
+import com.massivecraft.factions.struct.Role;
 import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdChat extends FCommand {
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdChest.java b/src/main/java/com/massivecraft/factions/cmd/CmdChest.java
@@ -2,6 +2,7 @@
 
 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;
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdClaim.java b/src/main/java/com/massivecraft/factions/cmd/CmdClaim.java
@@ -4,6 +4,7 @@
 import com.massivecraft.factions.FLocation;
 import com.massivecraft.factions.Faction;
 import com.massivecraft.factions.struct.Permission;
+import com.massivecraft.factions.struct.Role;
 import com.massivecraft.factions.util.SpiralTask;
 import com.massivecraft.factions.zcore.fperms.Access;
 import com.massivecraft.factions.zcore.fperms.PermissableAction;
@@ -45,7 +46,6 @@ public void perform() {
         }
 
 
-
         if (radius < 1) {
             msg(TL.COMMAND_CLAIM_INVALIDRADIUS);
             return;
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdDeinvite.java b/src/main/java/com/massivecraft/factions/cmd/CmdDeinvite.java
@@ -4,6 +4,9 @@
 import com.massivecraft.factions.FPlayer;
 import com.massivecraft.factions.FPlayers;
 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;
 import mkremins.fanciful.FancyMessage;
 import org.bukkit.ChatColor;
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdDisband.java b/src/main/java/com/massivecraft/factions/cmd/CmdDisband.java
@@ -4,6 +4,8 @@
 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;
 import org.bukkit.Bukkit;
 
@@ -16,7 +18,6 @@ public class CmdDisband extends FCommand {
     private static HashMap<String, String> disbandMap = new HashMap<>();
 
 
-
     public CmdDisband() {
         super();
         this.aliases.add("disband");
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFWarp.java b/src/main/java/com/massivecraft/factions/cmd/CmdFWarp.java
@@ -3,6 +3,7 @@
 import com.massivecraft.factions.FPlayer;
 import com.massivecraft.factions.P;
 import com.massivecraft.factions.struct.Permission;
+import com.massivecraft.factions.struct.Role;
 import com.massivecraft.factions.util.WarmUpUtil;
 import com.massivecraft.factions.util.WarpGUI;
 import com.massivecraft.factions.zcore.fperms.Access;
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFly.java b/src/main/java/com/massivecraft/factions/cmd/CmdFly.java
@@ -54,7 +54,7 @@ public void run() {
                             continue;
                         }
                     }
-                   
+
                     if (FPlayers.getInstance().getByPlayer(player).isVanished()) {
                         // Actually, vanished players (such as admins) should not display particles to prevent others from knowing their vanished assistance for moderation.
                         // But we can keep it as a config.
@@ -228,7 +228,6 @@ public void perform() {
         }
 
 
-
         if (args.size() == 0) {
             toggleFlight(!fme.isFlying(), me);
         } else if (args.size() == 1) {
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdHome.java b/src/main/java/com/massivecraft/factions/cmd/CmdHome.java
@@ -6,6 +6,8 @@
 import com.massivecraft.factions.struct.Relation;
 import com.massivecraft.factions.struct.Role;
 import com.massivecraft.factions.util.WarmUpUtil;
+import com.massivecraft.factions.zcore.fperms.Access;
+import com.massivecraft.factions.zcore.fperms.PermissableAction;
 import com.massivecraft.factions.zcore.util.SmokeUtil;
 import com.massivecraft.factions.zcore.util.TL;
 import org.bukkit.Location;
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdInvite.java b/src/main/java/com/massivecraft/factions/cmd/CmdInvite.java
@@ -81,7 +81,7 @@ public void perform() {
 
             message.send(target.getPlayer());
         }
-        
+
         myFaction.msg(TL.COMMAND_INVITE_INVITED, fme.describeTo(myFaction, true), target.describeTo(myFaction));
     }
 
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdSetFWarp.java b/src/main/java/com/massivecraft/factions/cmd/CmdSetFWarp.java
@@ -35,7 +35,6 @@ public void perform() {
             return;
         }
 
-        Access access = myFaction.getAccess(fme, PermissableAction.SETWARP);
         // This statement allows us to check if they've specifically denied it, or default to
         // the old setting of allowing moderators to set warps.
         if (!fme.isAdminBypassing()) {
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdStealth.java b/src/main/java/com/massivecraft/factions/cmd/CmdStealth.java
@@ -1,9 +1,7 @@
 package com.massivecraft.factions.cmd;
 
-import com.massivecraft.factions.Faction;
 import com.massivecraft.factions.struct.Permission;
 import com.massivecraft.factions.zcore.util.TL;
-import org.bukkit.ChatColor;
 
 public class CmdStealth extends FCommand {
     public CmdStealth() {
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdTntFill.java b/src/main/java/com/massivecraft/factions/cmd/CmdTntFill.java
@@ -43,7 +43,6 @@ public void perform() {
         }
 
 
-
         msg(TL.COMMAND_TNTFILL_HEADER);
         int radius = argAsInt(0, 16);
         int amount = argAsInt(1, 16);
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdUnclaim.java b/src/main/java/com/massivecraft/factions/cmd/CmdUnclaim.java
@@ -128,8 +128,7 @@ private boolean unClaim(FLocation target) {
         }
 
 
-
-        if (targetFaction.getAccess(fme,PermissableAction.TERRITORY) == Access.DENY) {
+        if (targetFaction.getAccess(fme, PermissableAction.TERRITORY) == Access.DENY) {
             return false;
         }
 
diff --git a/src/main/java/com/massivecraft/factions/cmd/FPromoteCommand.java b/src/main/java/com/massivecraft/factions/cmd/FPromoteCommand.java
@@ -63,7 +63,7 @@ public void perform() {
                 return;
             }
         }
-        
+
         if (promotion == null) {
             fme.msg(TL.COMMAND_PROMOTE_NOTTHATPLAYER);
             return;
diff --git a/src/main/java/com/massivecraft/factions/listeners/FactionsBlockListener.java b/src/main/java/com/massivecraft/factions/listeners/FactionsBlockListener.java
@@ -80,7 +80,7 @@ public void onBlockBreak(BlockBreakEvent event) {
         }
         if (event.getBlock().getType() == Material.LEGACY_MOB_SPAWNER) {
             if (!fme.isAdminBypassing()) {
-            Access access = myFaction.getAccess(fme, PermissableAction.SPAWNER);
+                Access access = fme.getFaction().getAccess(fme, PermissableAction.SPAWNER);
                 if (access != Access.ALLOW && fme.getRole() != Role.ADMIN) {
                     fme.msg(TL.GENERIC_FPERM_NOPERMISSION, "mine spawners");
                     return;
diff --git a/src/main/java/com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.java b/src/main/java/com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.java
@@ -41,26 +41,24 @@ public void openMainMenu(FPlayer fme) {
         List<Integer> spawnerSlots = P.p.getConfig().getIntegerList("fupgrades.MainMenu.Spawners.SpawnerItem.slots");
         List<Integer> expSlots = P.p.getConfig().getIntegerList("fupgrades.MainMenu.EXP.EXPItem.slots");
         List<Integer> chestSlots = P.p.getConfig().getIntegerList("fupgrades.MainMenu.Chest.ChestItem.slots");
-        if (cropSlots != -1) {
-            for (int i = 0; i <= cropSlots.size() - 1; i++) {
-                inventory.setItem(cropSlots.get(i), items[2]);
-            }
+        for (int i = 0; i <= cropSlots.size() - 1; i++) {
+            inventory.setItem(cropSlots.get(i), items[2]);
         }
-        if (spawnerSlots != -1) {
-            for (int i = 0; i <= spawnerSlots.size() - 1; i++) {
-                inventory.setItem(spawnerSlots.get(i), items[1]);
-            }
+
+        for (int i = 0; i <= spawnerSlots.size() - 1; i++) {
+            inventory.setItem(spawnerSlots.get(i), items[1]);
         }
-        if (expSlots != -1) {
-            for (int i = 0; i <= expSlots.size() - 1; i++) {
-                inventory.setItem(expSlots.get(i), items[0]);
-            }
+
+
+        for (int i = 0; i <= expSlots.size() - 1; i++) {
+            inventory.setItem(expSlots.get(i), items[0]);
         }
-        if (chestSlots != -1) {
-            for (int i = 0; i <= chestSlots.size() - 1; i++) {
-                inventory.setItem(chestSlots.get(i), items[3]);
-            }
+
+
+        for (int i = 0; i <= chestSlots.size() - 1; i++) {
+            inventory.setItem(chestSlots.get(i), items[3]);
         }
+
         fme.getPlayer().openInventory(inventory);
     }
 
diff --git a/src/main/java/com/massivecraft/factions/zcore/util/TL.java b/src/main/java/com/massivecraft/factions/zcore/util/TL.java
@@ -505,6 +505,8 @@ public enum TL {
     COMMAND_NOACCESS("&c&l[!]&7 You don't have access to that."),
     COMMAND_PROMOTE_NOTTHATPLAYER("&c&l[!]&7 That player &ccannot&7 be promoted."),
     COMMAND_PROMOTE_NOT_ALLOWED("&c&l[!]&7 You cannot promote to the same rank as yourself!"),
+    COMMAND_PROMOTE_NOTSELF("&c&l[!]&7 You cannot manage your own rank."),
+    COMMAND_PROMOTE_NOT_SAME("&c&l[!]&7 You cannot promote to the same rank as yourself!"),
 
 
     COMMAND_POWER_TOSHOW("to show player power info"),
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
@@ -12,6 +12,8 @@
 # It's suggested that you only turn this on at the direction of a developer.
 debug: false
 
+
+
 # Prevent find factions exploit
 # This will help limit how many times a player can be sent a map of factions.
 # Set this to the cooldown you want, in miliseconds, for a map to be shown to a player.
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -102,7 +102,6 @@ permissions:
       factions.monitorlogins: true
       factions.top: true
       factions.togglealliancechat: true
-      factions.vault: true
       factions.mapheight: true
       factions.ban: true
       factions.fly: true

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public void run() {`
`54`	`54`	`continue;`
`55`	`55`	`}`
`56`	`56`	`}`
`57`		`-`
	`57`	`+`
`58`	`58`	`if (FPlayers.getInstance().getByPlayer(player).isVanished()) {`
`59`	`59`	`// Actually, vanished players (such as admins) should not display particles to prevent others from knowing their vanished assistance for moderation.`
`60`	`60`	`// But we can keep it as a config.`
`@@ -228,7 +228,6 @@ public void perform() {`
`228`	`228`	`}`
`229`	`229`
`230`	`230`
`231`		`-`
`232`	`231`	`if (args.size() == 0) {`
`233`	`232`	`toggleFlight(!fme.isFlying(), me);`
`234`	`233`	`} else if (args.size() == 1) {`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ public void perform() {`
`81`	`81`
`82`	`82`	`message.send(target.getPlayer());`
`83`	`83`	`}`
`84`		`-`
	`84`	`+`
`85`	`85`	`myFaction.msg(TL.COMMAND_INVITE_INVITED, fme.describeTo(myFaction, true), target.describeTo(myFaction));`
`86`	`86`	`}`
`87`	`87`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,6 @@ public void perform() {`
`35`	`35`	`return;`
`36`	`36`	`}`
`37`	`37`
`38`		`- Access access = myFaction.getAccess(fme, PermissableAction.SETWARP);`
`39`	`38`	`// This statement allows us to check if they've specifically denied it, or default to`
`40`	`39`	`// the old setting of allowing moderators to set warps.`
`41`	`40`	`if (!fme.isAdminBypassing()) {`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,6 @@ public void perform() {`
`43`	`43`	`}`
`44`	`44`
`45`	`45`
`46`		`-`
`47`	`46`	`msg(TL.COMMAND_TNTFILL_HEADER);`
`48`	`47`	`int radius = argAsInt(0, 16);`
`49`	`48`	`int amount = argAsInt(1, 16);`
Original file line number	Diff line number	Diff line change
`@@ -128,8 +128,7 @@ private boolean unClaim(FLocation target) {`
`128`	`128`	`}`
`129`	`129`
`130`	`130`
`131`		`-`
`132`		`- if (targetFaction.getAccess(fme,PermissableAction.TERRITORY) == Access.DENY) {`
	`131`	`+ if (targetFaction.getAccess(fme, PermissableAction.TERRITORY) == Access.DENY) {`
`133`	`132`	`return false;`
`134`	`133`	`}`
`135`	`134`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public void perform() {`
`63`	`63`	`return;`
`64`	`64`	`}`
`65`	`65`	`}`
`66`		`-`
	`66`	`+`
`67`	`67`	`if (promotion == null) {`
`68`	`68`	`fme.msg(TL.COMMAND_PROMOTE_NOTTHATPLAYER);`
`69`	`69`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ public void onBlockBreak(BlockBreakEvent event) {`
`80`	`80`	`}`
`81`	`81`	`if (event.getBlock().getType() == Material.LEGACY_MOB_SPAWNER) {`
`82`	`82`	`if (!fme.isAdminBypassing()) {`
`83`		`- Access access = myFaction.getAccess(fme, PermissableAction.SPAWNER);`
	`83`	`+ Access access = fme.getFaction().getAccess(fme, PermissableAction.SPAWNER);`
`84`	`84`	`if (access != Access.ALLOW && fme.getRole() != Role.ADMIN) {`
`85`	`85`	`fme.msg(TL.GENERIC_FPERM_NOPERMISSION, "mine spawners");`
`86`	`86`	`return;`