Skip to content

Commit 60296f6

Browse files
committed
add ability to toggle list
1 parent 468bbcc commit 60296f6

File tree

2 files changed

+17
-4
lines changed
  • AnarchyExploitFixesFolia/src/main/java/me/xginko/aef/modules/dupepreventions
  • AnarchyExploitFixesLegacy/src/main/java/me/xginko/aef/modules/dupepreventions

2 files changed

+17
-4
lines changed

AnarchyExploitFixesFolia/src/main/java/me/xginko/aef/modules/dupepreventions/TridentDupe.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ public TridentDupe() {
3030
this.dupePreventedMaterial = config.getList(configPath + ".materials",
3131
Stream.of(XMaterial.TRIDENT, XMaterial.ARROW, XMaterial.TIPPED_ARROW,
3232
XMaterial.SPECTRAL_ARROW, XMaterial.EGG, XMaterial.WIND_CHARGE)
33-
.filter(XMaterial::isSupported).map(XMaterial::get).map(Enum::name).collect(Collectors.toList()))
33+
.filter(XMaterial::isSupported).map(XMaterial::get).map(Enum::name).collect(Collectors.toList()),"""
34+
Apply the check for relevant materials only to not break features like alt silent swap.
35+
If you do not wish to check for specific materials, leave this list empty.""")
3436
.stream()
3537
.map(configuredMaterial -> {
3638
try {
@@ -59,5 +61,9 @@ private void onInventoryClick(InventoryClickEvent event) {
5961
if (dupePreventedMaterial.contains(event.getWhoClicked().getActiveItem().getType())) {
6062
event.setCancelled(true);
6163
}
64+
65+
else if (dupePreventedMaterial.isEmpty() && event.getWhoClicked().getActiveItem().getType() != XMaterial.AIR.get()) {
66+
event.setCancelled(true);
67+
}
6268
}
6369
}

AnarchyExploitFixesLegacy/src/main/java/me/xginko/aef/modules/dupepreventions/TridentDupe.java

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@ public TridentDupe() {
3131
this.dupePreventedMaterial = config.getList(configPath + ".materials",
3232
Stream.of(XMaterial.TRIDENT, XMaterial.ARROW, XMaterial.TIPPED_ARROW,
3333
XMaterial.SPECTRAL_ARROW, XMaterial.EGG, XMaterial.WIND_CHARGE)
34-
.filter(XMaterial::isSupported).map(XMaterial::get).map(Enum::name).collect(Collectors.toList()))
34+
.filter(XMaterial::isSupported).map(XMaterial::get).map(Enum::name).collect(Collectors.toList()),
35+
"Apply the check for relevant materials only to not break features like alt silent swap.\n" +
36+
"If you do not wish to check for specific materials, leave this list empty.")
3537
.stream()
3638
.map(configuredMaterial -> {
3739
try {
@@ -57,8 +59,13 @@ public void disable() {
5759

5860
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
5961
private void onInventoryClick(InventoryClickEvent event) {
60-
if (event.getWhoClicked().getActiveItem() != null
61-
&& dupePreventedMaterial.contains(event.getWhoClicked().getActiveItem().getType())) {
62+
if (event.getWhoClicked().getActiveItem() == null) return;
63+
64+
if (dupePreventedMaterial.contains(event.getWhoClicked().getActiveItem().getType())) {
65+
event.setCancelled(true);
66+
}
67+
68+
else if (dupePreventedMaterial.isEmpty() && event.getWhoClicked().getActiveItem().getType() != XMaterial.AIR.get()) {
6269
event.setCancelled(true);
6370
}
6471
}

0 commit comments

Comments
 (0)