From ae61303a9b66f2697b7be15bc681c12634f97a09 Mon Sep 17 00:00:00 2001 From: "JamesFrowen-PC\\JamesFrowen" Date: Fri, 18 Jan 2019 16:08:51 +0000 Subject: [PATCH] allowing warps to be replaced at max warps --- .../java/com/massivecraft/factions/cmd/CmdSetFWarp.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdSetFWarp.java b/src/main/java/com/massivecraft/factions/cmd/CmdSetFWarp.java index 2c1a65c9..7646b54d 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdSetFWarp.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdSetFWarp.java @@ -45,10 +45,15 @@ public class CmdSetFWarp extends FCommand { return; } } + + String warp = argAsString(0); + // Checks if warp with same name already exists and ignores maxWarp check if it does. + boolean warpExists = myFaction.isWarp(warp); int maxWarps = SavageFactions.plugin.getConfig().getInt("max-warps", 5); - if (maxWarps <= myFaction.getWarps().size()) { + boolean tooManyWarps = maxWarps <= myFaction.getWarps().size(); + if (tooManyWarps && !warpExists) { fme.msg(TL.COMMAND_SETFWARP_LIMIT, maxWarps); return; } @@ -57,7 +62,6 @@ public class CmdSetFWarp extends FCommand { return; } - String warp = argAsString(0); String password = argAsString(1); LazyLocation loc = new LazyLocation(fme.getPlayer().getLocation());