GH-835 Add permission-based access to warps #856
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| package com.eternalcode.core.feature.warp; | ||
|
|
||
| import com.eternalcode.annotations.scan.feature.FeatureDocs; | ||
| import com.eternalcode.core.configuration.implementation.PluginConfiguration; | ||
| import com.eternalcode.core.feature.warp.event.PreWarpTeleportEvent; | ||
| import com.eternalcode.core.injector.annotations.Inject; | ||
| import com.eternalcode.core.injector.annotations.component.Controller; | ||
| import com.eternalcode.core.notice.NoticeService; | ||
| import org.bukkit.entity.Player; | ||
| import org.bukkit.event.EventHandler; | ||
| import org.bukkit.event.Listener; | ||
|
|
||
| import java.util.Map; | ||
| import java.util.Optional; | ||
| import java.util.Set; | ||
| import java.util.UUID; | ||
|
|
||
| @FeatureDocs( | ||
| description = "Check if a player has permission to use a specific warp", | ||
| name = "Warp permission" | ||
| ) | ||
| @Controller | ||
| public class WarpPermissionController implements Listener { | ||
|
|
||
| private final NoticeService noticeService; | ||
| private final PluginConfiguration pluginConfiguration; | ||
|
|
||
| @Inject | ||
| public WarpPermissionController(NoticeService noticeService, PluginConfiguration pluginConfiguration) { | ||
| this.noticeService = noticeService; | ||
| this.pluginConfiguration = pluginConfiguration; | ||
| } | ||
|
|
||
| @EventHandler | ||
| void onWarpPreTeleportation(PreWarpTeleportEvent event) { | ||
| Player player = event.getPlayer(); | ||
| UUID uniqueId = player.getUniqueId(); | ||
| Warp warp = event.getWarp(); | ||
|
|
||
| this.checkWarpPermission(event, warp, player, uniqueId); | ||
| } | ||
|
|
||
| private void checkWarpPermission(PreWarpTeleportEvent event, Warp warp, Player player, UUID uniqueId) { | ||
|
There was a problem hiding this comment. 🛠️ Refactor suggestion Simplify method parameters by removing redundant The Apply this diff to simplify the method: -private void checkWarpPermission(PreWarpTeleportEvent event, Warp warp, Player player, UUID uniqueId) {
+private void checkWarpPermission(PreWarpTeleportEvent event, Warp warp, Player player) {Update the usage of - .player(uniqueId)
+ .player(player.getUniqueId())And adjust the method call in -this.checkWarpPermission(event, warp, player, uniqueId);
+this.checkWarpPermission(event, warp, player);
|
||
| Map<String, Set<String>> warpPermissions = this.pluginConfiguration.warp.warpPermissions; | ||
|
|
||
| if (!warpPermissions.containsKey(warp.getName())) { | ||
| return; | ||
| } | ||
|
|
||
| Set<String> permissions = warpPermissions.get(warp.getName()); | ||
| Optional<String> isPlayerAllowedToUseWarp = permissions | ||
| .stream() | ||
| .filter(player::hasPermission) | ||
| .findAny(); | ||
|
|
||
| if (isPlayerAllowedToUseWarp.isPresent()) { | ||
| return; | ||
| } | ||
|
|
||
| event.setCancelled(true); | ||
|
|
||
| this.noticeService.create() | ||
| .player(uniqueId) | ||
| .placeholder("{WARP}", warp.getName()) | ||
eripe14 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| .notice(translation -> translation.warp().noPermission()) | ||
| .send(); | ||
|
Comment on lines
+55
to
+59
There was a problem hiding this comment. 🛠️ Refactor suggestion Enhance player feedback by including required permissions Currently, the player is notified that they lack permission to use the warp but does not know which permission is needed. Providing the specific permissions required can help players understand what is needed to access the warp. Consider modifying the notice to include the missing permissions: this.noticeService.create()
.player(uniqueId)
.placeholder("{WARP}", warp.getName())
+ .placeholder("{PERMISSIONS}", String.join(", ", permissions))
.notice(translation -> translation.warp().noPermission())
.send();Ensure that the
|
||
| } | ||
|
|
||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Remove unused
PluginConfigurationdependencyThe
pluginConfigurationfield and its corresponding constructor parameter are declared but not used within the class. Removing unused fields helps keep the codebase clean and maintainable.Apply this diff to remove the unused field and constructor parameter:
📝 Committable suggestion