Skip to content

Commit 132d99d

Browse files
xGinkoxGinko
committed
handle bypass permissions more sanely on illegal item modules
1 parent 30f3508 commit 132d99d

File tree

2 files changed

+48
-22
lines changed

2 files changed

+48
-22
lines changed

‎AnarchyExploitFixesFolia/src/main/java/me/xginko/aef/modules/illegals/items/IllegalItemModule.java‎

Lines changed: 26 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,8 @@ public void onPlayerItemConsume(PlayerItemConsumeEvent event) {
204204
return;
205205
}
206206

207+
if (AnarchyExploitFixes.permissions().permissionValue(event.getPlayer(), bypassPermission.node()).toBoolean()) return;
208+
207209
if (legalityOf(event.getItem()) != ItemLegality.LEGAL) {
208210
event.setCancelled(true);
209211
listenerCooldowns.get(event.getClass(), createIfAbsent).add(event.getPlayer().getUniqueId());
@@ -235,13 +237,13 @@ public void onPlayerArmorChange(PlayerArmorChangeEvent event) {
235237

236238
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
237239
public void onInventoryClick(InventoryClickEvent event) {
238-
if (AnarchyExploitFixes.permissions().permissionValue(event.getWhoClicked(), bypassPermission.node()).toBoolean()) return;
239-
240240
if (listenerCooldowns.get(event.getClass(), createIfAbsent).contains(event.getWhoClicked().getUniqueId())) {
241241
event.setCancelled(true);
242242
return;
243243
}
244244

245+
if (AnarchyExploitFixes.permissions().permissionValue(event.getWhoClicked(), bypassPermission.node()).toBoolean()) return;
246+
245247
ItemLegality clickedLegality = legalityOf(event.getCurrentItem());
246248
if (clickedLegality != ItemLegality.LEGAL) {
247249
event.setCancelled(true);
@@ -259,13 +261,13 @@ public void onInventoryClick(InventoryClickEvent event) {
259261

260262
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
261263
public void onInventoryInteract(InventoryInteractEvent event) {
262-
if (AnarchyExploitFixes.permissions().permissionValue(event.getWhoClicked(), bypassPermission.node()).toBoolean()) return;
263-
264264
if (listenerCooldowns.get(event.getClass(), createIfAbsent).contains(event.getWhoClicked().getUniqueId())) {
265265
event.setCancelled(true);
266266
return;
267267
}
268268

269+
if (AnarchyExploitFixes.permissions().permissionValue(event.getWhoClicked(), bypassPermission.node()).toBoolean()) return;
270+
269271
for (ItemStack invItem : event.getInventory()) {
270272
ItemLegality invItemLegality = legalityOf(invItem);
271273
if (invItemLegality != ItemLegality.LEGAL) {
@@ -283,17 +285,19 @@ public void onPrePlayerAttackEntity(PrePlayerAttackEntityEvent event) {
283285
return;
284286
}
285287

288+
if (AnarchyExploitFixes.permissions().permissionValue(event.getPlayer(), bypassPermission.node()).toBoolean()) return;
289+
286290
ItemStack mainHandItem = event.getPlayer().getInventory().getItemInMainHand();
287291
final ItemLegality mainHandLegality = legalityOf(mainHandItem);
288-
if (mainHandLegality != ItemLegality.LEGAL && !AnarchyExploitFixes.permissions().permissionValue(event.getPlayer(), bypassPermission.node()).toBoolean()) {
292+
if (mainHandLegality != ItemLegality.LEGAL) {
289293
event.setCancelled(true);
290294
handleItem(mainHandItem, mainHandLegality);
291295
listenerCooldowns.get(event.getClass(), createIfAbsent).add(event.getPlayer().getUniqueId());
292296
}
293297

294298
ItemStack offHandItem = event.getPlayer().getInventory().getItemInOffHand();
295299
final ItemLegality offHandLegality = legalityOf(offHandItem);
296-
if (offHandLegality != ItemLegality.LEGAL && !AnarchyExploitFixes.permissions().permissionValue(event.getPlayer(), bypassPermission.node()).toBoolean()) {
300+
if (offHandLegality != ItemLegality.LEGAL) {
297301
event.setCancelled(true);
298302
handleItem(offHandItem, offHandLegality);
299303
listenerCooldowns.get(event.getClass(), createIfAbsent).add(event.getPlayer().getUniqueId());
@@ -310,17 +314,19 @@ public void onEntityDamageByEntity(EntityDamageByEntityEvent event) {
310314
return;
311315
}
312316

317+
if (AnarchyExploitFixes.permissions().permissionValue(player, bypassPermission.node()).toBoolean()) return;
318+
313319
ItemStack mainHandItem = player.getInventory().getItemInMainHand();
314320
final ItemLegality mainHandLegality = legalityOf(mainHandItem);
315-
if (mainHandLegality != ItemLegality.LEGAL && !AnarchyExploitFixes.permissions().permissionValue(player, bypassPermission.node()).toBoolean()) {
321+
if (mainHandLegality != ItemLegality.LEGAL) {
316322
event.setCancelled(true);
317323
handleItem(mainHandItem, mainHandLegality);
318324
listenerCooldowns.get(event.getClass(), createIfAbsent).add(player.getUniqueId());
319325
}
320326

321327
ItemStack offHandItem = player.getInventory().getItemInOffHand();
322328
final ItemLegality offHandLegality = legalityOf(offHandItem);
323-
if (offHandLegality != ItemLegality.LEGAL && !AnarchyExploitFixes.permissions().permissionValue(player, bypassPermission.node()).toBoolean()) {
329+
if (offHandLegality != ItemLegality.LEGAL) {
324330
event.setCancelled(true);
325331
handleItem(offHandItem, offHandLegality);
326332
listenerCooldowns.get(event.getClass(), createIfAbsent).add(player.getUniqueId());
@@ -353,9 +359,11 @@ public void onPlayerAttemptPickupItem(PlayerAttemptPickupItemEvent event) {
353359
return;
354360
}
355361

362+
if (AnarchyExploitFixes.permissions().permissionValue(event.getPlayer(), bypassPermission.node()).toBoolean()) return;
363+
356364
ItemStack pickUpItem = event.getItem().getItemStack();
357365
final ItemLegality legality = legalityOf(pickUpItem);
358-
if (legality != ItemLegality.LEGAL && !AnarchyExploitFixes.permissions().permissionValue(event.getPlayer(), bypassPermission.node()).toBoolean()) {
366+
if (legality != ItemLegality.LEGAL) {
359367
event.setCancelled(true);
360368
handleItem(pickUpItem, legality);
361369
event.getItem().setItemStack(pickUpItem);
@@ -370,9 +378,11 @@ public void onPlayerDropItem(PlayerDropItemEvent event) {
370378
return;
371379
}
372380

381+
if (AnarchyExploitFixes.permissions().permissionValue(event.getPlayer(), bypassPermission.node()).toBoolean()) return;
382+
373383
ItemStack droppedItem = event.getItemDrop().getItemStack();
374384
final ItemLegality legality = legalityOf(droppedItem);
375-
if (legality != ItemLegality.LEGAL && !AnarchyExploitFixes.permissions().permissionValue(event.getPlayer(), bypassPermission.node()).toBoolean()) {
385+
if (legality != ItemLegality.LEGAL) {
376386
handleItem(droppedItem, legality);
377387
event.getItemDrop().setItemStack(droppedItem);
378388
listenerCooldowns.get(event.getClass(), createIfAbsent).add(event.getPlayer().getUniqueId());
@@ -386,9 +396,11 @@ public void onPlayerInteract(PlayerInteractEvent event) {
386396
return;
387397
}
388398

399+
if (AnarchyExploitFixes.permissions().permissionValue(event.getPlayer(), bypassPermission.node()).toBoolean()) return;
400+
389401
ItemStack interactItem = event.getItem();
390402
final ItemLegality legality = legalityOf(interactItem);
391-
if (legality != ItemLegality.LEGAL && !AnarchyExploitFixes.permissions().permissionValue(event.getPlayer(), bypassPermission.node()).toBoolean()) {
403+
if (legality != ItemLegality.LEGAL) {
392404
event.setCancelled(true);
393405
handleItem(interactItem, legality);
394406
listenerCooldowns.get(event.getClass(), createIfAbsent).add(event.getPlayer().getUniqueId());
@@ -402,9 +414,11 @@ public void onPlayerInteractEntity(PlayerInteractEntityEvent event) {
402414
return;
403415
}
404416

417+
if (AnarchyExploitFixes.permissions().permissionValue(event.getPlayer(), bypassPermission.node()).toBoolean()) return;
418+
405419
ItemStack handItem = event.getPlayer().getInventory().getItem(event.getHand());
406420
final ItemLegality legality = legalityOf(handItem);
407-
if (legality != ItemLegality.LEGAL && !AnarchyExploitFixes.permissions().permissionValue(event.getPlayer(), bypassPermission.node()).toBoolean()) {
421+
if (legality != ItemLegality.LEGAL) {
408422
event.setCancelled(true);
409423
handleItem(handItem, legality);
410424
listenerCooldowns.get(event.getClass(), createIfAbsent).add(event.getPlayer().getUniqueId());

‎AnarchyExploitFixesLegacy/src/main/java/me/xginko/aef/modules/illegals/items/IllegalItemModule.java‎

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,8 @@ public void onPlayerItemConsume(PlayerItemConsumeEvent event) {
203203
return;
204204
}
205205

206+
if (AnarchyExploitFixes.permissions().permissionValue(event.getPlayer(), bypassPermission.node()).toBoolean()) return;
207+
206208
if (legalityOf(event.getItem()) != ItemLegality.LEGAL) {
207209
event.setCancelled(true);
208210
listenerCooldowns.get(event.getClass(), createIfAbsent).add(event.getPlayer().getUniqueId());
@@ -234,13 +236,13 @@ public void onPlayerArmorChange(PlayerArmorChangeEvent event) {
234236

235237
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
236238
public void onInventoryClick(InventoryClickEvent event) {
237-
if (AnarchyExploitFixes.permissions().permissionValue(event.getWhoClicked(), bypassPermission.node()).toBoolean()) return;
238-
239239
if (listenerCooldowns.get(event.getClass(), createIfAbsent).contains(event.getWhoClicked().getUniqueId())) {
240240
event.setCancelled(true);
241241
return;
242242
}
243243

244+
if (AnarchyExploitFixes.permissions().permissionValue(event.getWhoClicked(), bypassPermission.node()).toBoolean()) return;
245+
244246
ItemLegality clickedLegality = legalityOf(event.getCurrentItem());
245247
if (clickedLegality != ItemLegality.LEGAL) {
246248
event.setCancelled(true);
@@ -258,13 +260,13 @@ public void onInventoryClick(InventoryClickEvent event) {
258260

259261
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
260262
public void onInventoryInteract(InventoryInteractEvent event) {
261-
if (AnarchyExploitFixes.permissions().permissionValue(event.getWhoClicked(), bypassPermission.node()).toBoolean()) return;
262-
263263
if (listenerCooldowns.get(event.getClass(), createIfAbsent).contains(event.getWhoClicked().getUniqueId())) {
264264
event.setCancelled(true);
265265
return;
266266
}
267267

268+
if (AnarchyExploitFixes.permissions().permissionValue(event.getWhoClicked(), bypassPermission.node()).toBoolean()) return;
269+
268270
for (ItemStack invItem : event.getInventory()) {
269271
ItemLegality invItemLegality = legalityOf(invItem);
270272
if (invItemLegality != ItemLegality.LEGAL) {
@@ -285,17 +287,19 @@ public void onEntityDamageByEntity(EntityDamageByEntityEvent event) {
285287
return;
286288
}
287289

290+
if (AnarchyExploitFixes.permissions().permissionValue(player, bypassPermission.node()).toBoolean()) return;
291+
288292
ItemStack mainHandItem = player.getInventory().getItemInMainHand();
289293
final ItemLegality mainHandLegality = legalityOf(mainHandItem);
290-
if (mainHandLegality != ItemLegality.LEGAL && !AnarchyExploitFixes.permissions().permissionValue(player, bypassPermission.node()).toBoolean()) {
294+
if (mainHandLegality != ItemLegality.LEGAL) {
291295
event.setCancelled(true);
292296
handleItem(mainHandItem, mainHandLegality);
293297
listenerCooldowns.get(event.getClass(), createIfAbsent).add(player.getUniqueId());
294298
}
295299

296300
ItemStack offHandItem = player.getInventory().getItemInOffHand();
297301
final ItemLegality offHandLegality = legalityOf(offHandItem);
298-
if (offHandLegality != ItemLegality.LEGAL && !AnarchyExploitFixes.permissions().permissionValue(player, bypassPermission.node()).toBoolean()) {
302+
if (offHandLegality != ItemLegality.LEGAL) {
299303
event.setCancelled(true);
300304
handleItem(offHandItem, offHandLegality);
301305
listenerCooldowns.get(event.getClass(), createIfAbsent).add(player.getUniqueId());
@@ -328,9 +332,11 @@ public void onPlayerAttemptPickupItem(PlayerAttemptPickupItemEvent event) {
328332
return;
329333
}
330334

335+
if (AnarchyExploitFixes.permissions().permissionValue(event.getPlayer(), bypassPermission.node()).toBoolean()) return;
336+
331337
ItemStack pickUpItem = event.getItem().getItemStack();
332338
final ItemLegality legality = legalityOf(pickUpItem);
333-
if (legality != ItemLegality.LEGAL && !AnarchyExploitFixes.permissions().permissionValue(event.getPlayer(), bypassPermission.node()).toBoolean()) {
339+
if (legality != ItemLegality.LEGAL) {
334340
event.setCancelled(true);
335341
handleItem(pickUpItem, legality);
336342
event.getItem().setItemStack(pickUpItem);
@@ -345,9 +351,11 @@ public void onPlayerDropItem(PlayerDropItemEvent event) {
345351
return;
346352
}
347353

354+
if (AnarchyExploitFixes.permissions().permissionValue(event.getPlayer(), bypassPermission.node()).toBoolean()) return;
355+
348356
ItemStack droppedItem = event.getItemDrop().getItemStack();
349357
final ItemLegality legality = legalityOf(droppedItem);
350-
if (legality != ItemLegality.LEGAL && !AnarchyExploitFixes.permissions().permissionValue(event.getPlayer(), bypassPermission.node()).toBoolean()) {
358+
if (legality != ItemLegality.LEGAL) {
351359
handleItem(droppedItem, legality);
352360
event.getItemDrop().setItemStack(droppedItem);
353361
listenerCooldowns.get(event.getClass(), createIfAbsent).add(event.getPlayer().getUniqueId());
@@ -361,9 +369,11 @@ public void onPlayerInteract(PlayerInteractEvent event) {
361369
return;
362370
}
363371

372+
if (AnarchyExploitFixes.permissions().permissionValue(event.getPlayer(), bypassPermission.node()).toBoolean()) return;
373+
364374
ItemStack interactItem = event.getItem();
365375
final ItemLegality legality = legalityOf(interactItem);
366-
if (legality != ItemLegality.LEGAL && !AnarchyExploitFixes.permissions().permissionValue(event.getPlayer(), bypassPermission.node()).toBoolean()) {
376+
if (legality != ItemLegality.LEGAL) {
367377
event.setCancelled(true);
368378
handleItem(interactItem, legality);
369379
listenerCooldowns.get(event.getClass(), createIfAbsent).add(event.getPlayer().getUniqueId());
@@ -377,9 +387,11 @@ public void onPlayerInteractEntity(PlayerInteractEntityEvent event) {
377387
return;
378388
}
379389

390+
if (AnarchyExploitFixes.permissions().permissionValue(event.getPlayer(), bypassPermission.node()).toBoolean()) return;
391+
380392
ItemStack handItem = event.getPlayer().getInventory().getItem(event.getHand());
381393
final ItemLegality legality = legalityOf(handItem);
382-
if (legality != ItemLegality.LEGAL && !AnarchyExploitFixes.permissions().permissionValue(event.getPlayer(), bypassPermission.node()).toBoolean()) {
394+
if (legality != ItemLegality.LEGAL) {
383395
event.setCancelled(true);
384396
handleItem(handItem, legality);
385397
listenerCooldowns.get(event.getClass(), createIfAbsent).add(event.getPlayer().getUniqueId());

0 commit comments

Comments
 (0)