From 4c80ade48d8e0ad216950520d62f6bb7395ddc2f Mon Sep 17 00:00:00 2001 From: Svenja Reissaus Date: Sun, 5 Aug 2018 01:52:12 -0300 Subject: [PATCH 1/2] Fixed #34 disabled banner alert --- src/main/java/com/massivecraft/factions/cmd/CmdBanner.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdBanner.java b/src/main/java/com/massivecraft/factions/cmd/CmdBanner.java index 90fe1598..60175fdc 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdBanner.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdBanner.java @@ -32,7 +32,7 @@ public class CmdBanner extends FCommand { @Override public void perform() { if (!P.p.getConfig().getBoolean("fbanners.Enabled")) { - + msg(TL.COMMAND_BANNER_DISABLED); return; } if (!fme.hasMoney(P.p.getConfig().getInt("fbanners.Banner-Cost", 5000))) { From 38a693b85e0d18509c0c4f5868f0f21c8c3d71cb Mon Sep 17 00:00:00 2001 From: Svenja Reissaus Date: Sun, 5 Aug 2018 02:07:26 -0300 Subject: [PATCH 2/2] Fixed #36 minor typos --- src/main/java/com/massivecraft/factions/zcore/util/TL.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 a5b1edb8..5ac9dc31 100644 --- a/src/main/java/com/massivecraft/factions/zcore/util/TL.java +++ b/src/main/java/com/massivecraft/factions/zcore/util/TL.java @@ -327,7 +327,7 @@ public enum TL { COMMAND_INVITE_TOINVITE("to invite someone"), COMMAND_INVITE_FORINVITE("for inviting someone"), COMMAND_INVITE_CLICKTOJOIN("Click to join!"), - COMMAND_INVITE_INVITEDYOU("&chas invited you to join "), + COMMAND_INVITE_INVITEDYOU(" &chas invited you to join "), COMMAND_INVITE_INVITED("&c&l[!]&7 &c%1$s&7 invited &c%2$s&7 to your faction."), COMMAND_INVITE_ALREADYMEMBER("&c&l[!]&7 &c%1$s&7 is already a member of&c %2$s"), COMMAND_INVITE_ALREADYINVITED("&c&l[!]&7 &c%1$s&7 has already been invited"), @@ -335,7 +335,7 @@ public enum TL { COMMAND_INVITE_BANNED("&c&l[!]&7 &7%1$s &cis banned &7from your Faction. &cNot &7sending an invite."), COMMAND_JOIN_CANNOTFORCE("&c&l[!]&7 You&c do not&7 have permission to &cmove other players&7 into a faction."), - COMMAND_JOIN_SYSTEMFACTION("&c&l[!]&7 Players may nly join &cnormal factions&7. This is a &c&lsystem faction&7."), + COMMAND_JOIN_SYSTEMFACTION("&c&l[!]&7 Players may only join &cnormal factions&7. This is a &c&lsystem faction&7."), COMMAND_JOIN_ALREADYMEMBER("&c&l[!]&7 &c%1$s %2$s already a member of&c %3$s"), COMMAND_JOIN_ATLIMIT(" &c&l[!]&7 The faction &c%1$s &7is at the limit of&c %2$d&7 members, so&c %3$s&7 cannot currently join."), COMMAND_JOIN_INOTHERFACTION("&c&l[!]&7 &c%1$s &7must leave&c %2$s &7current faction first."),