Skip to content

feat: add global rejoin cooldown option #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SrBedrock merged 11 commits into from
Aug 23, 2025
Merged

feat: add global rejoin cooldown option #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f16512a
feat: add global rejoin cooldown option
SrBedrock Aug 22, 2025
236d385
buid: update PlaceholderAPI dependency to 2.11.6
SrBedrock Aug 22, 2025
0b067d2
Add final modifier to method parameters
SrBedrock Aug 22, 2025
d1815ae
Replace String length checks with isEmpty in ClanManager
SrBedrock Aug 22, 2025
3f1cd97
Annotate getResignTimes with @NotNull and refactor usage
SrBedrock Aug 22, 2025
e0e29cb
Merge branch 'update' into codex/add-getminutesbeforeaction-method
SrBedrock Aug 22, 2025
3f2c69f
add "rejoin-cooldown-global" explanation
SrBedrock Aug 22, 2025
38735fd
Add GLOBAL_REJOIN_COOLDOWN config import
SrBedrock Aug 22, 2025
63c5041
Refactor VentureChatListener to extend SCListener
SrBedrock Aug 22, 2025
deb55a1
Fix type of rejoin cooldown variable
SrBedrock Aug 22, 2025
2f6cb8a
Add final modifiers to method parameters and variables
SrBedrock Aug 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/main/java/net/sacredlabyrinth/phaed/simpleclans/ClanPlayer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -600,6 +600,7 @@ public Set<String> getPastClans() {
*
* @return the resign times
*/
@NotNull
public Map<String, Long> getResignTimes() {
return resignTimes;
}
Expand Down
89 changes: 44 additions & 45 deletions src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/clan/ClanCommands.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,10 @@ public class ClanCommands extends BaseCommand {
@Conditions("verified|rank:name=WAR_START")
@Description("{@@command.description.war.start}")
@CommandCompletion("@rivals")
public void startWar(Player player, ClanPlayer requester, Clan requestClan, @Conditions("can_war_target") @Name("clan") ClanInput targetClanInput) {
Clan targetClan = targetClanInput.getClan();
public void startWar(final Player player, final ClanPlayer requester, final Clan requestClan, @Conditions("can_war_target") @Name("clan") final ClanInput targetClanInput) {
final Clan targetClan = targetClanInput.getClan();

List<ClanPlayer> onlineLeaders = Helper.stripOffLinePlayers(requestClan.getLeaders());
final List<ClanPlayer> onlineLeaders = Helper.stripOffLinePlayers(requestClan.getLeaders());

if (settings.is(WAR_START_REQUEST_ENABLED)) {
if (!onlineLeaders.isEmpty()) {
Expand All @@ -94,8 +94,8 @@ public void startWar(Player player, ClanPlayer requester, Clan requestClan, @Con
@Conditions("verified|rank:name=WAR_END")
@Description("{@@command.description.war.end}")
@CommandCompletion("@warring_clans")
public void endWar(ClanPlayer cp, Clan issuerClan, @Name("clan") ClanInput other) {
Clan war = other.getClan();
public void endWar(final ClanPlayer cp, final Clan issuerClan, @Name("clan") final ClanInput other) {
final Clan war = other.getClan();
if (issuerClan.isWarring(war.getTag())) {
requestManager.addWarEndRequest(cp, war, issuerClan);
ChatBlock.sendMessage(cp, AQUA + lang("leaders.asked.to.end.rivalry", cp, war.getName()));
Expand All @@ -108,16 +108,16 @@ public void endWar(ClanPlayer cp, Clan issuerClan, @Name("clan") ClanInput other
@CommandPermission("simpleclans.leader.modtag")
@Conditions("verified|rank:name=MODTAG")
@Description("{@@command.description.modtag}")
public void modtag(Player player, Clan clan, @Single @Name("tag") String tag) {
TagChangeEvent event = new TagChangeEvent(player, clan, tag);
public void modtag(final Player player, final Clan clan, @Single @Name("tag") String tag) {
final TagChangeEvent event = new TagChangeEvent(player, clan, tag);
plugin.getServer().getPluginManager().callEvent(event);
if (event.isCancelled()) {
return;
}
tag = event.getNewTag();
String cleanTag = Helper.cleanTag(tag);
final String cleanTag = Helper.cleanTag(tag);

Optional<String> validationError = plugin.getTagValidator().validate(player, tag);
final Optional<String> validationError = plugin.getTagValidator().validate(player, tag);
if (validationError.isPresent()) {
ChatBlock.sendMessage(player, validationError.get());
return;
Expand All @@ -138,9 +138,8 @@ public void modtag(Player player, Clan clan, @Single @Name("tag") String tag) {
@CommandPermission("simpleclans.leader.setbanner")
@Conditions("verified|rank:name=SETBANNER")
@Description("{@@command.description.setbanner}")
public void setbanner(Player player, Clan clan) {
@SuppressWarnings("deprecation")
ItemStack hand = player.getItemInHand();
public void setbanner(final Player player, final Clan clan) {
@SuppressWarnings("deprecation") final ItemStack hand = player.getItemInHand();
if (!hand.getType().toString().contains("BANNER")) {
ChatBlock.sendMessageKey(player, "you.must.hold.a.banner");
return;
Expand All @@ -156,13 +155,13 @@ public void setbanner(Player player, Clan clan) {
@CommandCompletion("@non_members:ignore_vanished")
@Conditions("rank:name=INVITE")
@Description("{@@command.description.invite}")
public void invite(Player sender, ClanPlayer cp, Clan clan,
@Conditions("not_banned|not_in_clan|online:ignore_vanished") @Name("player") ClanPlayerInput invited) {
public void invite(final Player sender, final ClanPlayer cp, final Clan clan,
@Conditions("not_banned|not_in_clan|online:ignore_vanished") @Name("player") final ClanPlayerInput invited) {
if (!invited.getClanPlayer().isInviteEnabled()) {
ChatBlock.sendMessage(sender, RED + lang("invitedplayer.invite.off", sender));
return;
}
Player invitedPlayer = invited.getClanPlayer().toPlayer();
final Player invitedPlayer = invited.getClanPlayer().toPlayer();
if (invitedPlayer == null) return;
if (!permissions.has(invitedPlayer, "simpleclans.member.can-join")) {
ChatBlock.sendMessage(sender, RED +
Expand All @@ -173,8 +172,8 @@ public void invite(Player sender, ClanPlayer cp, Clan clan,
ChatBlock.sendMessage(sender, RED + lang("you.cannot.invite.yourself", sender));
return;
}
long minutesBeforeRejoin = cm.getMinutesBeforeRejoin(invited.getClanPlayer(), clan);
if (minutesBeforeRejoin != 0) {
final long minutesBeforeRejoin = cm.getMinutesBeforeRejoin(invited.getClanPlayer(), clan);
if (minutesBeforeRejoin > 0L) {
ChatBlock.sendMessage(sender, RED +
lang("the.player.must.wait.0.before.joining.your.clan.again", sender, minutesBeforeRejoin));
return;
Expand All @@ -197,7 +196,7 @@ public void invite(Player sender, ClanPlayer cp, Clan clan,
@Conditions("member_fee_enabled|verified")
@CommandPermission("simpleclans.member.fee-check")
@Description("{@@command.description.fee.check}")
public void checkFee(Player player, Clan clan) {
public void checkFee(final Player player, final Clan clan) {
ChatBlock.sendMessage(player, AQUA
+ lang("the.fee.is.0.and.its.current.value.is.1", player, clan.isMemberFeeEnabled() ?
lang("fee.enabled", player) : lang("fee.disabled", player),
Expand All @@ -209,9 +208,9 @@ public void checkFee(Player player, Clan clan) {
@CommandPermission("simpleclans.leader.fee")
@Conditions("rank:name=FEE_SET|change_fee")
@Description("{@@command.description.fee.set}")
public void setFee(Player player, Clan clan, @Name("fee") double fee) {
public void setFee(final Player player, final Clan clan, @Name("fee") double fee) {
fee = Math.abs(fee);
double maxFee = settings.getDouble(ECONOMY_MAX_MEMBER_FEE);
final double maxFee = settings.getDouble(ECONOMY_MAX_MEMBER_FEE);
if (fee > maxFee) {
ChatBlock.sendMessage(player, RED
+ lang("max.fee.allowed.is.0", player, CurrencyFormat.format(maxFee)));
Expand All @@ -229,7 +228,7 @@ public void setFee(Player player, Clan clan, @Name("fee") double fee) {
@CommandPermission("simpleclans.leader.ff")
@Conditions("rank:name=FRIENDLYFIRE")
@Description("{@@command.description.clanff.allow}")
public void allowClanFf(Player player, Clan clan) {
public void allowClanFf(final Player player, final Clan clan) {
clan.addBb(player.getName(), lang("clan.wide.friendly.fire.is.allowed"));
clan.setFriendlyFire(true);
storage.updateClan(clan);
Expand All @@ -238,7 +237,7 @@ public void allowClanFf(Player player, Clan clan) {
@Subcommand("%clanff %block")
@CommandPermission("simpleclans.leader.ff")
@Description("{@@command.description.clanff.block}")
public void blockClanFf(Player player, Clan clan) {
public void blockClanFf(final Player player, final Clan clan) {
clan.addBb(player.getName(), lang("clan.wide.friendly.fire.blocked"));
clan.setFriendlyFire(false);
storage.updateClan(clan);
Expand All @@ -248,7 +247,7 @@ public void blockClanFf(Player player, Clan clan) {
@CommandPermission("simpleclans.leader.description")
@Conditions("verified|rank:name=DESCRIPTION")
@Description("{@@command.description.description}")
public void setDescription(Player player, Clan clan, @Name("description") String description) {
public void setDescription(final Player player, final Clan clan, @Name("description") final String description) {
if (description.length() < settings.getInt(CLAN_MIN_DESCRIPTION_LENGTH)) {
ChatBlock.sendMessage(player, RED + lang("your.clan.description.must.be.longer.than",
player, settings.getInt(CLAN_MIN_DESCRIPTION_LENGTH)));
Expand All @@ -269,8 +268,8 @@ public void setDescription(Player player, Clan clan, @Name("description") String
@Conditions("verified|rivable|minimum_to_rival|rank:name=RIVAL_ADD")
@CommandCompletion("@clans:hide_own")
@Description("{@@command.description.rival.add}")
public void addRival(Player player, Clan issuerClan, @Conditions("verified|different") @Name("clan") ClanInput rival) {
Clan rivalInput = rival.getClan();
public void addRival(final Player player, final Clan issuerClan, @Conditions("verified|different") @Name("clan") final ClanInput rival) {
final Clan rivalInput = rival.getClan();
if (settings.isUnrivable(rivalInput.getTag())) {
ChatBlock.sendMessage(player, RED + lang("the.clan.cannot.be.rivaled", player));
return;
Expand All @@ -295,11 +294,11 @@ public void addRival(Player player, Clan issuerClan, @Conditions("verified|diffe
@Conditions("verified|rank:name=RIVAL_REMOVE")
@CommandCompletion("@rivals")
@Description("{@@command.description.rival.remove}")
public void removeRival(Player player,
ClanPlayer cp,
Clan issuerClan,
@Conditions("different") @Name("clan") ClanInput rival) {
Clan rivalInput = rival.getClan();
public void removeRival(final Player player,
final ClanPlayer cp,
final Clan issuerClan,
@Conditions("different") @Name("clan") final ClanInput rival) {
final Clan rivalInput = rival.getClan();
if (issuerClan.isRival(rivalInput.getTag())) {
requestManager.addRivalryBreakRequest(cp, rivalInput, issuerClan);
ChatBlock.sendMessage(player, AQUA + lang("leaders.asked.to.end.rivalry", player,
Expand All @@ -314,16 +313,16 @@ public void removeRival(Player player,
@Conditions("verified|rank:name=ALLY_ADD|minimum_to_ally")
@CommandCompletion("@clans:hide_own")
@Description("{@@command.description.ally.add}")
public void addAlly(Player player,
ClanPlayer cp,
Clan issuerClan,
@Conditions("verified|different") @Name("clan") ClanInput other) {
Clan input = other.getClan();
public void addAlly(final Player player,
final ClanPlayer cp,
final Clan issuerClan,
@Conditions("verified|different") @Name("clan") final ClanInput other) {
final Clan input = other.getClan();
if (issuerClan.isAlly(input.getTag())) {
ChatBlock.sendMessage(player, RED + lang("your.clans.are.already.allies", player));
return;
}
int maxAlliances = settings.getInt(CLAN_MAX_ALLIANCES);
final int maxAlliances = settings.getInt(CLAN_MAX_ALLIANCES);
if (maxAlliances != -1) {
if (issuerClan.getAllies().size() >= maxAlliances) {
ChatBlock.sendMessage(player, lang("your.clan.reached.max.alliances", player));
Expand All @@ -335,7 +334,7 @@ public void addAlly(Player player,
}
}

List<ClanPlayer> onlineLeaders = Helper.stripOffLinePlayers(issuerClan.getLeaders());
final List<ClanPlayer> onlineLeaders = Helper.stripOffLinePlayers(issuerClan.getLeaders());
if (onlineLeaders.isEmpty()) {
ChatBlock.sendMessage(player, RED + lang("at.least.one.leader.accept.the.alliance",
player));
Expand All @@ -352,8 +351,8 @@ public void addAlly(Player player,
@CommandPermission("simpleclans.leader.ally")
@Description("{@@command.description.ally.remove}")
@CommandCompletion("@allied_clans")
public void removeAlly(Player player, Clan issuerClan, @Conditions("different|allied_clan") @Name("clan") ClanInput ally) {
Clan allyInput = ally.getClan();
public void removeAlly(final Player player, final Clan issuerClan, @Conditions("different|allied_clan") @Name("clan") final ClanInput ally) {
final Clan allyInput = ally.getClan();
issuerClan.removeAlly(allyInput);
allyInput.addBb(player.getName(), lang("has.broken.the.alliance", issuerClan.getName(),
allyInput.getName()), false);
Expand All @@ -366,14 +365,14 @@ public void removeAlly(Player player, Clan issuerClan, @Conditions("different|al
@CommandCompletion("@clan_members:hide_own")
@Conditions("rank:name=KICK")
@Description("{@@command.description.kick}")
public void kick(@Conditions("clan_member") Player sender,
@Conditions("same_clan") @Name("member") ClanPlayerInput other) {
ClanPlayer clanPlayer = other.getClanPlayer();
public void kick(@Conditions("clan_member") final Player sender,
@Conditions("same_clan") @Name("member") final ClanPlayerInput other) {
final ClanPlayer clanPlayer = other.getClanPlayer();
if (sender.getUniqueId().equals(clanPlayer.getUniqueId())) {
ChatBlock.sendMessage(sender, RED + lang("you.cannot.kick.yourself", sender));
return;
}
Clan clan = cm.getClanByPlayerUniqueId(sender.getUniqueId());
final Clan clan = cm.getClanByPlayerUniqueId(sender.getUniqueId());
if (Objects.requireNonNull(clan).isLeader(clanPlayer.getUniqueId())) {
ChatBlock.sendMessage(sender, RED + lang("you.cannot.kick.another.leader", sender));
return;
Expand All @@ -390,7 +389,7 @@ public void kick(@Conditions("clan_member") Player sender,
@CommandPermission("simpleclans.member.resign")
@Description("{@@command.description.resign}")
@HelpSearchTags("leave")
public void resignConfirm(Player player, ClanPlayer cp, Clan clan) {
public void resignConfirm(final Player player, final ClanPlayer cp, final Clan clan) {
if (!new PrePlayerLeaveClanEvent(player, player).callEvent()) {
ChatBlock.sendMessage(player, RED + lang("error.event.cancelled", player));
} else if (clan.isPermanent() || !clan.isLeader(player) || clan.getLeaders().size() > 1) {
Expand All @@ -410,7 +409,7 @@ public void resignConfirm(Player player, ClanPlayer cp, Clan clan) {
@CommandPermission("simpleclans.member.resign")
@Description("{@@command.description.resign}")
@HelpSearchTags("leave")
public void resign(@Conditions("clan_member") Player player) {
public void resign(@Conditions("clan_member") final Player player) {
if (!new PrePlayerLeaveClanEvent(player, player).callEvent()) {
ChatBlock.sendMessage(player, RED + lang("error.event.cancelled", player));
return;
Expand Down
Loading