Skip to content

Commit 2de51a9

Browse files
authored
GH-911 Fix typo in afk config, fix permission check order, add constant for permission for afk permission. (#911)
* fixed bypass check order, typo in AfkPlaceholderSetup, fixed placeholder formatting * Add constant for permission. * revert rtp changes (my bad) * Fix.
1 parent 7d1b07b commit 2de51a9

File tree

5 files changed

+16
-15
lines changed

5 files changed

+16
-15
lines changed

eternalcore-core/src/main/java/com/eternalcode/core/feature/afk/AfkCommand.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
)
2525
class AfkCommand {
2626

27+
private static final String AFK_BYPASS_PERMISSION = "eternalcore.afk.bypass";
28+
2729
private final NoticeService noticeService;
2830
private final PluginConfiguration pluginConfiguration;
2931
private final AfkService afkService;
@@ -38,10 +40,15 @@ class AfkCommand {
3840
}
3941

4042
@Execute
41-
@DescriptionDocs(description = "Marks you as AFK, if player has eternalcore.afk.bypass permission, eternalcore will be ignore afk delay")
43+
@DescriptionDocs(description = "Marks you as AFK, if player has eternalcore.afk.bypass permission, eternalcore will ignore afk delay")
4244
void execute(@Context Player player) {
4345
UUID uuid = player.getUniqueId();
4446

47+
if (player.hasPermission(AFK_BYPASS_PERMISSION)) {
48+
this.afkService.switchAfk(uuid, AfkReason.COMMAND);
49+
return;
50+
}
51+
4552
if (this.delay.hasDelay(uuid)) {
4653
Duration time = this.delay.getDurationToExpire(uuid);
4754

@@ -56,11 +63,6 @@ void execute(@Context Player player) {
5663
}
5764

5865
this.afkService.switchAfk(uuid, AfkReason.COMMAND);
59-
60-
if (player.hasPermission("eternalcore.afk.bypass")) {
61-
return;
62-
}
63-
6466
this.delay.markDelay(uuid, this.pluginConfiguration.afk.getAfkDelay());
6567
}
6668
}

eternalcore-core/src/main/java/com/eternalcode/core/feature/afk/AftPlaceholderSetup.java renamed to eternalcore-core/src/main/java/com/eternalcode/core/feature/afk/AfkPlaceholderSetup.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
import java.util.Optional;
1515

1616
@Controller
17-
class AftPlaceholderSetup {
17+
class AfkPlaceholderSetup {
1818

1919
private final TranslationManager translationManager;
2020

2121
@Inject
22-
AftPlaceholderSetup(TranslationManager translationManager) {
22+
AfkPlaceholderSetup(TranslationManager translationManager) {
2323
this.translationManager = translationManager;
2424
}
2525

eternalcore-core/src/main/java/com/eternalcode/core/feature/afk/AfkServiceImpl.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
import com.eternalcode.core.notice.NoticeService;
88
import com.eternalcode.core.user.User;
99
import com.eternalcode.core.user.UserManager;
10+
import java.util.HashMap;
1011
import java.util.Optional;
1112
import org.jetbrains.annotations.ApiStatus;
1213

1314
import java.time.Duration;
1415
import java.time.Instant;
15-
import java.util.HashMap;
1616
import java.util.Map;
1717
import java.util.UUID;
1818

@@ -126,5 +126,4 @@ private void sendAfkNotification(UUID playerUniqueId, boolean afk) {
126126
.placeholder("{PLAYER}", this.userManager.getUser(playerUniqueId).map(User::getName))
127127
.send();
128128
}
129-
130129
}

eternalcore-core/src/main/java/com/eternalcode/core/feature/afk/AfkTask.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,11 @@
33
import com.eternalcode.core.feature.vanish.VanishService;
44
import com.eternalcode.core.injector.annotations.Inject;
55
import com.eternalcode.core.injector.annotations.component.Task;
6+
import java.util.UUID;
67
import java.util.concurrent.TimeUnit;
78
import org.bukkit.Server;
89
import org.bukkit.entity.Player;
910

10-
import java.util.UUID;
11-
1211
@Task(delay = 1L, period = 1L, unit = TimeUnit.MINUTES)
1312
class AfkTask implements Runnable {
1413

@@ -55,5 +54,4 @@ void markAllInactivePlayers() {
5554
}
5655
}
5756
}
58-
5957
}

eternalcore-core/src/main/java/com/eternalcode/core/feature/afk/messages/PLAfkMessages.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,18 @@ public class PLAfkMessages implements AfkMessages {
1313

1414
@Description("# {PLAYER} - Gracz ")
1515
public Notice afkOn = Notice.chat("<green>► <white>{PLAYER} jest AFK!");
16+
17+
@Description("# {PLAYER} - Gracz ")
1618
public Notice afkOff = Notice.chat("<green>► <white>{PLAYER} już nie jest AFK!");
1719

1820
@Description({" ", "# {TIME} - Czas po którym gracz może użyć komendy"})
1921
public Notice afkDelay = Notice.chat("<red>► <dark_red>Możesz użyć tej komendy dopiero po <dark_red>{TIME}!");
2022

2123
@Description({" "})
22-
public String afkKickReason = "<red>Zostałeś wyrzucone z powodu braku aktywności!";
24+
public String afkKickReason = "<red>Zostałeś wyrzucony z powodu braku aktywności!";
2325

2426
@Description({" ", "# Używane w %eternalcore_afk_formatted% do wskazania statusu AFK"})
2527
public String afkEnabledPlaceholder = "<red><b>AFK";
26-
public String afkDisabledPlaceholder = "";
2728

29+
public String afkDisabledPlaceholder = "";
2830
}

0 commit comments

Comments
 (0)