From 8cdabd1aa086e0b5718d4646f635d1495effac1f Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 24 Jul 2026 10:51:37 +0000 Subject: [PATCH 1/2] Initial plan From 4251036efdaa913721c61b17f841918032c9a1d0 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 24 Jul 2026 10:55:38 +0000 Subject: [PATCH 2/2] Add custom duration support to combat tag command --- README.md | 2 +- .../eternalcode/combat/fight/FightTagCommand.java | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 283a7174..0a3b5054 100644 --- a/README.md +++ b/README.md @@ -85,7 +85,7 @@ Control who can use EternalCombat’s powerful features with these permissions: | Permission | Description | |--------------------------------|-------------------------------------------------------------------------------------------------------| | `eternalcombat.status` | Check a player’s combat status with `/combatlog status `. | -| `eternalcombat.tag` | Start a fight between players using `/combatlog tag [player2]`. | +| `eternalcombat.tag` | Start a fight between players using `/combatlog tag [player2] [duration]`. | | `eternalcombat.untag` | Remove a player from combat with `/combatlog untag `. | | `eternalcombat.untagall` | Remove all players from combat with `/combatlog untagall`. | | `eternalcombat.stats` | View combat statistics with `/combatlog stats`. | diff --git a/eternalcombat-plugin/src/main/java/com/eternalcode/combat/fight/FightTagCommand.java b/eternalcombat-plugin/src/main/java/com/eternalcode/combat/fight/FightTagCommand.java index 228f8288..8fd26587 100644 --- a/eternalcombat-plugin/src/main/java/com/eternalcode/combat/fight/FightTagCommand.java +++ b/eternalcombat-plugin/src/main/java/com/eternalcode/combat/fight/FightTagCommand.java @@ -53,8 +53,14 @@ void status(@Context CommandSender sender, @Arg Player target) { @Permission("eternalcombat.tag") @Priority(PriorityValue.HIGH) void tag(@Context CommandSender sender, @Arg Player target) { + this.tag(sender, target, this.config.settings.combatTimerDuration); + } + + @Execute(name = "tag") + @Permission("eternalcombat.tag") + @Priority(PriorityValue.HIGH) + void tag(@Context CommandSender sender, @Arg Player target, @Arg Duration time) { UUID targetUniqueId = target.getUniqueId(); - Duration time = this.config.settings.combatTimerDuration; FightTagEvent event = this.fightManager.tag(targetUniqueId, time, CauseOfTag.COMMAND); @@ -76,7 +82,12 @@ void tag(@Context CommandSender sender, @Arg Player target) { @Execute(name = "tag") @Permission("eternalcombat.tag") void tagMultiple(@Context CommandSender sender, @Arg Player firstTarget, @Arg Player secondTarget) { - Duration combatTime = this.config.settings.combatTimerDuration; + this.tagMultiple(sender, firstTarget, secondTarget, this.config.settings.combatTimerDuration); + } + + @Execute(name = "tag") + @Permission("eternalcombat.tag") + void tagMultiple(@Context CommandSender sender, @Arg Player firstTarget, @Arg Player secondTarget, @Arg Duration combatTime) { MessagesSettings messagesSettings = this.config.messagesSettings; if (sender.equals(firstTarget) || sender.equals(secondTarget)) {