From 01913e72861667810b9ddaaa110fd300d33e9c29 Mon Sep 17 00:00:00 2001 From: Stefan923 Date: Tue, 5 May 2020 18:30:09 +0300 Subject: [PATCH 1/5] Fixed an internal error. Player wasn't being removed from teleportRange after a failed teleportation. --- src/main/java/com/massivecraft/factions/cmd/wild/CmdWild.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/massivecraft/factions/cmd/wild/CmdWild.java b/src/main/java/com/massivecraft/factions/cmd/wild/CmdWild.java index c0b0ba8d..a97ea2a3 100644 --- a/src/main/java/com/massivecraft/factions/cmd/wild/CmdWild.java +++ b/src/main/java/com/massivecraft/factions/cmd/wild/CmdWild.java @@ -75,6 +75,7 @@ public class CmdWild extends FCommand implements WaitedTask { } if (!success) { p.sendMessage(TL.COMMAND_WILD_FAILED.toString()); + teleportRange.remove(p); } } @@ -114,6 +115,7 @@ public class CmdWild extends FCommand implements WaitedTask { @Override public void handleFailure(Player player) { player.sendMessage(TL.COMMAND_WILD_INTERUPTED.toString()); + teleportRange.remove(player); } } From 7fc1ad19adfffdeedb69aaa39dedc450af1d8652 Mon Sep 17 00:00:00 2001 From: Stefan923 Date: Tue, 5 May 2020 18:32:50 +0300 Subject: [PATCH 2/5] Fixed an internal error. Trying to send a message without enough arguments. --- src/main/java/com/massivecraft/factions/cmd/wild/CmdWild.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/com/massivecraft/factions/cmd/wild/CmdWild.java b/src/main/java/com/massivecraft/factions/cmd/wild/CmdWild.java index a97ea2a3..6a5d556d 100644 --- a/src/main/java/com/massivecraft/factions/cmd/wild/CmdWild.java +++ b/src/main/java/com/massivecraft/factions/cmd/wild/CmdWild.java @@ -46,8 +46,6 @@ public class CmdWild extends FCommand implements WaitedTask { public void perform(CommandContext context) { if (!teleportRange.containsKey(context.player)) { context.player.openInventory(new WildGUI(context.player, context.fPlayer).getInventory()); - } else { - context.fPlayer.msg(TL.COMMAND_WILD_WAIT); } } From 04273de995f71b9ed3ac51650b13a1c25de7d770 Mon Sep 17 00:00:00 2001 From: BrowkS Date: Wed, 6 May 2020 12:36:24 +0300 Subject: [PATCH 3/5] Removed an unnecessary check --- src/main/java/com/massivecraft/factions/tag/FactionTag.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/main/java/com/massivecraft/factions/tag/FactionTag.java b/src/main/java/com/massivecraft/factions/tag/FactionTag.java index fda5a663..c799e47b 100644 --- a/src/main/java/com/massivecraft/factions/tag/FactionTag.java +++ b/src/main/java/com/massivecraft/factions/tag/FactionTag.java @@ -149,10 +149,7 @@ public enum FactionTag implements Tag { if (!this.foundInString(text)) { return text; } - String result = null; - if (this.biFunction != null) { - result = this.function == null ? this.biFunction.apply(faction, player) : this.function.apply(faction); - } + String result = this.function == null ? this.biFunction.apply(faction, player) : this.function.apply(faction); return result == null ? null : text.replace(this.tag, result); } From 55fd5ffdfd9f375d05145dd34099cdc731c574f5 Mon Sep 17 00:00:00 2001 From: BrowkS Date: Wed, 6 May 2020 13:07:16 +0300 Subject: [PATCH 4/5] Added {player-role} placeholder. --- src/main/java/com/massivecraft/factions/tag/PlayerTag.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/massivecraft/factions/tag/PlayerTag.java b/src/main/java/com/massivecraft/factions/tag/PlayerTag.java index c5b7d316..30a3a780 100644 --- a/src/main/java/com/massivecraft/factions/tag/PlayerTag.java +++ b/src/main/java/com/massivecraft/factions/tag/PlayerTag.java @@ -21,6 +21,7 @@ public enum PlayerTag implements Tag { }), PLAYER_BALANCE("{balance}", (fp) -> Econ.isSetup() ? Econ.getFriendlyBalance(fp) : (Tag.isMinimalShow() ? null : TL.ECON_OFF.format("balance"))), PLAYER_POWER("{player-power}", (fp) -> String.valueOf(fp.getPowerRounded())), + ROLE("{player-role}", FPlayer::getRolePrefix), PLAYER_MAXPOWER("{player-maxpower}", (fp) -> String.valueOf(fp.getPowerMaxRounded())), PLAYER_KILLS("{player-kills}", (fp) -> String.valueOf(fp.getKills())), PLAYER_DEATHS("{player-deaths}", (fp) -> String.valueOf(fp.getDeaths())), From bf2352130939de82583e9b9977c3165e6f1d1308 Mon Sep 17 00:00:00 2001 From: BrowkS Date: Wed, 6 May 2020 22:32:40 +0300 Subject: [PATCH 5/5] Sending join message to faction members after setting player's faction and role. --- src/main/java/com/massivecraft/factions/cmd/CmdJoin.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdJoin.java b/src/main/java/com/massivecraft/factions/cmd/CmdJoin.java index c69dc745..5bad4de5 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdJoin.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdJoin.java @@ -115,8 +115,6 @@ public class CmdJoin extends FCommand { fplayer.msg(TL.COMMAND_JOIN_MOVED, context.fPlayer.describeTo(fplayer, true), faction.getTag(fplayer)); } - faction.msg(TL.COMMAND_JOIN_JOINED, fplayer.describeTo(faction, true)); - fplayer.resetFactionData(); if (faction.altInvited(fplayer)) { @@ -144,6 +142,8 @@ public class CmdJoin extends FCommand { System.out.print(e.getMessage()); } + faction.msg(TL.COMMAND_JOIN_JOINED, fplayer.describeTo(faction, true)); + if (Conf.logFactionJoin) { if (samePlayer) { FactionsPlugin.getInstance().log(TL.COMMAND_JOIN_JOINEDLOG.toString(), fplayer.getName(), faction.getTag());