diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdStealth.java b/src/main/java/com/massivecraft/factions/cmd/CmdStealth.java index 03e7bf86..b98cc5df 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdStealth.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdStealth.java @@ -29,6 +29,12 @@ public class CmdStealth extends FCommand { if (fme.isStealthEnabled()) { fme.setStealth(false); } else { + /* The FPlayer#takeMoney method calls the FPlayer#hasMoney method beforehand to check if the amount + * can be withdrawn successfully. + * The FPlayer#hasMoney method already sends a deny message so there isn't a need to send another. + * Basically the takeMoney is an all in one solution for taking money :) + */ + fme.takeMoney(P.p.getConfig().getInt("stealth-cost")); fme.setStealth(true); Bukkit.getScheduler().scheduleSyncDelayedTask(P.p, new Runnable() { @Override 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 d19788c6..5a03adde 100644 --- a/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFPlayer.java +++ b/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFPlayer.java @@ -1209,7 +1209,7 @@ public abstract class MemoryFPlayer implements FPlayer { return true; } else { getPlayer().closeInventory(); - msg(TL.COMMAND_UPGRADES_NOTENOUGHMONEY); + msg(TL.GENERIC_NOTENOUGHMONEY); return false; } } @@ -1219,7 +1219,7 @@ public abstract class MemoryFPlayer implements FPlayer { if (hasMoney(amt)) { Economy econ = P.p.getEcon(); econ.withdrawPlayer(getPlayer(), amt); - sendMessage(TL.COMMAND_UPGRADES_MONEYTAKE.toString().replace("{amount}", amt + "")); + sendMessage(TL.GENERIC_MONEYTAKE.toString().replace("{amount}", amt + "")); } } } \ No newline at end of file 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 544a6199..3c68ae2e 100644 --- a/src/main/java/com/massivecraft/factions/zcore/util/TL.java +++ b/src/main/java/com/massivecraft/factions/zcore/util/TL.java @@ -105,8 +105,8 @@ public enum TL { */ COMMAND_UPGRADES_DESCRIPTION("&cOpen the Upgrades Menu"), - COMMAND_UPGRADES_MONEYTAKE("&c{amount} has been taken from your account."), - COMMAND_UPGRADES_NOTENOUGHMONEY("&cYou dont have enough money!"), + + COMMAND_ADMIN_NOTMEMBER("&c&l[!] &7%1$s &cis not a member in your faction."), @@ -824,6 +824,8 @@ public enum TL { GENERIC_FACTIONTAG_TOOLONG("The faction tag can't be longer than %s chars."), GENERIC_FACTIONTAG_ALPHANUMERIC("Faction tag must be alphanumeric. \"%s\" is not allowed."), GENERIC_PLACEHOLDER(""), + GENERIC_NOTENOUGHMONEY("&cYou dont have enough money!"), + GENERIC_MONEYTAKE("&c{amount} has been taken from your account."), WARBANNER_NOFACTION("&cYou need a faction to use a warbanner!"), diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 377e51c7..7521d001 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -74,6 +74,7 @@ ffly: # This will set the timeout for the stealth in seconds. stealth-timeout: 300 +stealth-cost: 500 # If a player leaves fly (out of territory or took damage) # how long should they not take fall damage for?