-
Notifications
You must be signed in to change notification settings - Fork 2
Add block filtering feature with whitelist and blacklist settings #70
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.
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
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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
17 changes: 9 additions & 8 deletions
17
src/main/java/dev/twme/debugstickpro/mode/copy/CopyLeftClick.java
This file contains hidden or 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 hidden or 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
54 changes: 54 additions & 0 deletions
54
src/main/java/dev/twme/debugstickpro/utils/BlockFilterUtil.java
This file contains hidden or 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,54 @@ | ||
| package dev.twme.debugstickpro.utils; | ||
|
|
||
| import java.util.UUID; | ||
|
|
||
| import org.bukkit.Bukkit; | ||
| import org.bukkit.block.Block; | ||
| import org.bukkit.entity.Player; | ||
|
|
||
| import dev.twme.debugstickpro.config.ConfigFile; | ||
|
|
||
| public final class BlockFilterUtil { | ||
|
|
||
| /** | ||
| * Check if the block is allowed by the BlockFilter settings. | ||
| * | ||
| * @param player the player to check | ||
| * @param block the block to check | ||
| * @return true if the block is allowed, false if it is filtered out | ||
| */ | ||
| public static boolean isAllowed(Player player, Block block) { | ||
| if (player == null) { | ||
| return false; | ||
| } | ||
|
|
||
| // Bypass permission applies to both whitelist and blacklist. | ||
| if (player.hasPermission("debugstickpro.bypassblockfilter")) { | ||
| return true; | ||
| } | ||
|
|
||
| String materialName = block.getType().name(); | ||
|
|
||
| // Whitelist check | ||
| if (ConfigFile.BlockFilter.Whitelist.Enabled) { | ||
| boolean inWhitelist = ConfigFile.BlockFilter.Whitelist.Blocks.contains("*") | ||
| || ConfigFile.BlockFilter.Whitelist.Blocks.contains(materialName); | ||
| if (!inWhitelist) { | ||
| return false; | ||
| } | ||
| } | ||
|
|
||
| // Blacklist check (takes precedence) | ||
| if (ConfigFile.BlockFilter.Blacklist.Enabled) { | ||
| if (ConfigFile.BlockFilter.Blacklist.Blocks.contains(materialName)) { | ||
| return false; | ||
| } | ||
| } | ||
|
|
||
| return true; | ||
| } | ||
|
|
||
| public static boolean isAllowed(UUID playerUUID, Block block) { | ||
| return isAllowed(Bukkit.getPlayer(playerUUID), block); | ||
| } | ||
| } |
This file contains hidden or 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 hidden or 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
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.