From d0cf88c9c6b5d1004abedee334455b2d537f3a32 Mon Sep 17 00:00:00 2001 From: ProSavage Date: Sat, 4 Aug 2018 20:32:36 -0500 Subject: [PATCH] Fixed all errors with Sevenja's new commits --- .../com/massivecraft/factions/cmd/CmdBan.java | 5 ---- .../massivecraft/factions/cmd/CmdChat.java | 1 + .../massivecraft/factions/cmd/CmdChest.java | 1 + .../massivecraft/factions/cmd/CmdClaim.java | 2 +- .../factions/cmd/CmdDeinvite.java | 3 ++ .../massivecraft/factions/cmd/CmdDisband.java | 3 +- .../massivecraft/factions/cmd/CmdFWarp.java | 1 + .../com/massivecraft/factions/cmd/CmdFly.java | 3 +- .../massivecraft/factions/cmd/CmdHome.java | 2 ++ .../massivecraft/factions/cmd/CmdInvite.java | 2 +- .../factions/cmd/CmdSetFWarp.java | 1 - .../massivecraft/factions/cmd/CmdStealth.java | 2 -- .../massivecraft/factions/cmd/CmdTntFill.java | 1 - .../massivecraft/factions/cmd/CmdUnclaim.java | 3 +- .../factions/cmd/FPromoteCommand.java | 2 +- .../listeners/FactionsBlockListener.java | 2 +- .../zcore/fupgrades/FUpgradesGUI.java | 30 +++++++++---------- .../massivecraft/factions/zcore/util/TL.java | 2 ++ src/main/resources/config.yml | 2 ++ src/main/resources/plugin.yml | 1 - 20 files changed, 34 insertions(+), 35 deletions(-) diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdBan.java b/src/main/java/com/massivecraft/factions/cmd/CmdBan.java index 19cfa071..c899812d 100644 --- 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 class CmdBan extends FCommand { @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 index 7b58c80e..69cff8d8 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdChat.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdChat.java @@ -3,6 +3,7 @@ package com.massivecraft.factions.cmd; 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 index 9f90454a..52fa12c5 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdChest.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdChest.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; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdClaim.java b/src/main/java/com/massivecraft/factions/cmd/CmdClaim.java index a729236a..fe605796 100644 --- 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.Conf; 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 class CmdClaim extends FCommand { } - 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 index 24c3777d..540140f0 100644 --- 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.Conf; 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 index ab4975a0..90177f22 100644 --- 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.Faction; 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 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 index eae26dd5..95654ab6 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFWarp.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdFWarp.java @@ -3,6 +3,7 @@ package com.massivecraft.factions.cmd; 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 index b01c049f..248cb1cc 100644 --- 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 class CmdFly extends FCommand { 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 class CmdFly extends FCommand { } - 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 index 1f4ffc6b..04026809 100644 --- 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.Permission; 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 index 95f28619..3e913c51 100644 --- 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 class CmdInvite extends FCommand { 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 index b0e57380..c0984d4e 100644 --- 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 class CmdSetFWarp extends FCommand { 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 index 1d12faac..1955a8a5 100644 --- 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 index ee226b11..8e652b7b 100644 --- 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 class CmdTntFill extends FCommand { } - 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 index 2ebf8d58..74e6669e 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdUnclaim.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdUnclaim.java @@ -128,8 +128,7 @@ public class CmdUnclaim extends FCommand { } - - 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 index 947dc90d..8ff7a3ff 100644 --- 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 class FPromoteCommand extends FCommand { 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 index b4517828..4e48441d 100644 --- 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 class FactionsBlockListener implements Listener { } 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 index 4e269cdc..480c4cc5 100644 --- 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 class FUpgradesGUI implements Listener { List spawnerSlots = P.p.getConfig().getIntegerList("fupgrades.MainMenu.Spawners.SpawnerItem.slots"); List expSlots = P.p.getConfig().getIntegerList("fupgrades.MainMenu.EXP.EXPItem.slots"); List 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 index cbe4d82b..a5b1edb8 100644 --- 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 index d227629b..82ceda51 100644 --- 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 index 79a4d0da..a5a41450 100644 --- 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