From f3b0dcdb7f53e3059584c3c7ef6f4516f78943ce Mon Sep 17 00:00:00 2001 From: Driftay Date: Fri, 22 Nov 2019 04:55:58 -0500 Subject: [PATCH] Quick Fix With Fly Check Console Spam & Properly Defined Variables In TL for TNT command --- src/main/java/com/massivecraft/factions/FactionsPlugin.java | 2 +- src/main/java/com/massivecraft/factions/cmd/CmdFly.java | 2 +- src/main/java/com/massivecraft/factions/cmd/tnt/CmdTnt.java | 6 +++--- src/main/java/com/massivecraft/factions/util/Updater.java | 3 +-- .../massivecraft/factions/zcore/persist/MemoryFPlayer.java | 2 +- src/main/java/com/massivecraft/factions/zcore/util/TL.java | 2 +- src/main/resources/config.yml | 1 - 7 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/massivecraft/factions/FactionsPlugin.java b/src/main/java/com/massivecraft/factions/FactionsPlugin.java index 711e7d26..68b175c3 100755 --- a/src/main/java/com/massivecraft/factions/FactionsPlugin.java +++ b/src/main/java/com/massivecraft/factions/FactionsPlugin.java @@ -195,7 +195,7 @@ public class FactionsPlugin extends MPlugin { return; } //Update their config if needed - Updater.updateIfNeeded(getConfig()); + // Updater.updateIfNeeded(getConfig()); RegisteredServiceProvider rsp = FactionsPlugin.this.getServer().getServicesManager().getRegistration(Economy.class); FactionsPlugin.econ = rsp.getProvider(); com.massivecraft.factions.integration.Essentials.setup(); diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFly.java b/src/main/java/com/massivecraft/factions/cmd/CmdFly.java index 157f3b99..85e6b130 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFly.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdFly.java @@ -122,7 +122,7 @@ public class CmdFly extends FCommand { } return me.hasPermission(Permission.FLY.node) && (access != Access.DENY || toFac.isSystemFaction()); } - return fme.canFlyAtLocation(); + return true; } diff --git a/src/main/java/com/massivecraft/factions/cmd/tnt/CmdTnt.java b/src/main/java/com/massivecraft/factions/cmd/tnt/CmdTnt.java index fec0fd50..042504be 100644 --- a/src/main/java/com/massivecraft/factions/cmd/tnt/CmdTnt.java +++ b/src/main/java/com/massivecraft/factions/cmd/tnt/CmdTnt.java @@ -62,7 +62,7 @@ public class CmdTnt extends FCommand { return; } ItemStack tnt = new ItemStack(Material.TNT, amount); - if (context.faction.getTnt() + amount > FactionsPlugin.instance.getConfig().getInt("ftnt.Bank-Limit")) { + if (context.faction.getTnt() + amount > context.faction.getTntBankLimit()) { context.msg(TL.COMMAND_TNT_EXCEEDLIMIT); return; } @@ -71,7 +71,7 @@ public class CmdTnt extends FCommand { context.faction.addTnt(amount); context.msg(TL.COMMAND_TNT_DEPOSIT_SUCCESS); - context.fPlayer.sendMessage(FactionsPlugin.instance.color(TL.COMMAND_TNT_AMOUNT.toString().replace("{amount}", context.fPlayer.getFaction().getTnt() + ""))); + context.fPlayer.sendMessage(FactionsPlugin.instance.color(TL.COMMAND_TNT_AMOUNT.toString().replace("{amount}", context.faction.getTnt() + "").replace("{maxAmount}", context.faction.getTntBankLimit() + ""))); return; } @@ -113,7 +113,7 @@ public class CmdTnt extends FCommand { context.msg(TL.GENERIC_ARGS_TOOFEW); context.msg(context.args.get(0).equalsIgnoreCase("take") || context.args.get(0).equalsIgnoreCase("t") ? TL.COMMAND_TNT_TAKE_DESCRIPTION : TL.COMMAND_TNT_ADD_DESCRIPTION); } - context.sendMessage(TL.COMMAND_TNT_AMOUNT.toString().replace("{amount}", context.faction.getTnt() + "")); + context.sendMessage(TL.COMMAND_TNT_AMOUNT.toString().replace("{amount}", context.faction.getTnt() + "").replace("{maxAmount}", context.faction.getTntBankLimit() + "")); } diff --git a/src/main/java/com/massivecraft/factions/util/Updater.java b/src/main/java/com/massivecraft/factions/util/Updater.java index a45f484e..d17a9637 100644 --- a/src/main/java/com/massivecraft/factions/util/Updater.java +++ b/src/main/java/com/massivecraft/factions/util/Updater.java @@ -35,8 +35,7 @@ public class Updater { conf.set("Randomization.Start-Item.Disallowed.Lore", lore); conf.set("Randomization.Start-Item.Slot", 28); conf.set("Config-Version", 1.1); - version = 1.1; - + currentVersion = 1.1; } //End with save + reload try { diff --git a/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFPlayer.java b/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFPlayer.java index 11f3cac6..c05ad6f8 100644 --- a/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFPlayer.java +++ b/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFPlayer.java @@ -989,7 +989,7 @@ public abstract class MemoryFPlayer implements FPlayer { } if (faction.isSystemFaction()) { - return CmdFly.checkBypassPerms(this, this.getPlayer(), faction); + return CmdFly.checkBypassPerms(this, getPlayer(), faction); } Access access = faction.getAccess(this, PermissableAction.FLY); 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 5b728f44..2b1baeb0 100644 --- a/src/main/java/com/massivecraft/factions/zcore/util/TL.java +++ b/src/main/java/com/massivecraft/factions/zcore/util/TL.java @@ -888,7 +888,7 @@ public enum TL { COMMAND_TNT_WIDTHDRAW_SUCCESS("&cSuccessfully withdrew tnt."), COMMAND_TNT_WIDTHDRAW_NOTENOUGH("&cNot enough tnt in bank."), COMMAND_TNT_DEPOSIT_NOTENOUGH("&cNot enough tnt in tnt inventory."), - COMMAND_TNT_AMOUNT("&cYour faction has %1$s tnt in the tnt bank."), + COMMAND_TNT_AMOUNT("&cYour faction has {amount}/{maxAmount} 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."), diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index ccb1fdeb..e7606a6e 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -1331,7 +1331,6 @@ Tntfill: max-radius: 32 max-amount: 64 - ############################################################ # +------------------------------------------------------+ # # | Big List of variables | #