Upstream
/
ChestSort
mirror of https://github.com/JEFF-Media-GbR/ChestSort.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

14.0.0

This commit is contained in:
mfnalex 2024-05-02 09:23:27 +02:00
parent 51fc5a05cb
commit 02f4d96ff6
No known key found for this signature in database
GPG Key ID: 4A5852356225BAE1
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/de/jeff_media/chestsort/listeners/ChestSortListener.java
View File

@ -99,15 +99,21 @@ public class ChestSortListener implements org.bukkit.event.Listener {
}
for (String className : toCheck) {
plugin.debug("Checking blacklisted holder: " + className);
for (String blacklistedClassName : blacklistedInventoryHolderClassNames) {
plugin.debug("Checking against hardcoded blacklisted holder: " + blacklistedClassName);
if (className.contains(blacklistedClassName)) {
plugin.debug("Blacklisted holder found: " + className);
return true;
}
for(Pattern pattern : plugin.blacklistedInventoryHolderClassNames) {
Matcher matcher = pattern.matcher(className);
if(matcher.matches()) {
return true;
}
}
for(Pattern pattern : plugin.blacklistedInventoryHolderClassNames) {
plugin.debug("Checking against regex blacklisted holder: " + pattern.pattern());
Matcher matcher = pattern.matcher(className);
if(matcher.matches()) {
plugin.debug("Blacklisted holder found: " + className);
return true;
}
}
}
@ -253,6 +259,7 @@ public class ChestSortListener implements org.bukkit.event.Listener {
if(isPossiblyBlacklisted(event.getView())) {
plugin.debug("Abort: holder is blacklisted");
return;
}
if (event.getInventory().getHolder() == null) {
@ -312,6 +319,7 @@ public class ChestSortListener implements org.bukkit.event.Listener {
if(isPossiblyBlacklisted(event.getView())) {
plugin.debug("Abort: holder is blacklisted");
return;
}
if (!(plugin.getConfig().getString("sort-time").equalsIgnoreCase("close") ||
@ -368,6 +376,7 @@ public class ChestSortListener implements org.bukkit.event.Listener {
if(isPossiblyBlacklisted(event.getView())) {
plugin.debug("Abort: holder is blacklisted");
return;
}
if (!plugin.getConfig().getBoolean("allow-automatic-sorting")) {
@ -534,6 +543,7 @@ public class ChestSortListener implements org.bukkit.event.Listener {
if(isPossiblyBlacklisted(event.getView())) {
plugin.debug("Abort: holder is blacklisted");
return;
}
if (!(event.getPlayer() instanceof Player)) {
@ -568,6 +578,7 @@ public class ChestSortListener implements org.bukkit.event.Listener {
if(isPossiblyBlacklisted(event.getView())) {
plugin.debug("Abort: holder is blacklisted");
return;
}
if (!(event.getWhoClicked() instanceof Player)) {
@ -755,6 +766,7 @@ public class ChestSortListener implements org.bukkit.event.Listener {
if(isPossiblyBlacklisted(e.getView())) {
plugin.debug("Abort: holder is blacklisted");
return;
}
if (LlamaUtils.belongsToLlama(e.getInventory()) || LlamaUtils.belongsToLlama(e.getClickedInventory())) {

1
src/main/resources/config.yml
View File

@ -341,6 +341,7 @@ mute-protection-plugins: false
# that contain the word "Backpack"
blocked-inventory-holders-regex:
- ".*[Bb]ack[Pp]ack.*"
- "\Qcom.loohp.interactivechat.objectholders.ICInventoryHolder\E"
##########################
##### Sorting Method #####