From 27316cbcfe1ea218536750e6d8e5e9891a7ae779 Mon Sep 17 00:00:00 2001 From: xGinko Date: Wed, 4 Oct 2023 14:18:34 +0200 Subject: [PATCH] make use of command cooldown bypass --- .../commands/optimizevillagers/OptVillagersRadius.java | 3 ++- .../commands/optimizevillagers/OptVillagersRadius.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/VillagerOptimizer-1.16.5/src/main/java/me/xginko/villageroptimizer/commands/optimizevillagers/OptVillagersRadius.java b/VillagerOptimizer-1.16.5/src/main/java/me/xginko/villageroptimizer/commands/optimizevillagers/OptVillagersRadius.java index d7516c2..ba5deaf 100644 --- a/VillagerOptimizer-1.16.5/src/main/java/me/xginko/villageroptimizer/commands/optimizevillagers/OptVillagersRadius.java +++ b/VillagerOptimizer-1.16.5/src/main/java/me/xginko/villageroptimizer/commands/optimizevillagers/OptVillagersRadius.java @@ -77,6 +77,7 @@ public class OptVillagersRadius implements VillagerOptimizerCommand, TabComplete VillagerCache villagerCache = VillagerOptimizer.getCache(); int successCount = 0; int failCount = 0; + final boolean player_has_cooldown_bypass = player.hasPermission(Permissions.Bypass.COMMAND_COOLDOWN.get()); for (Entity entity : player.getNearbyEntities(specifiedRadius, specifiedRadius, specifiedRadius)) { if (!entity.getType().equals(EntityType.VILLAGER)) continue; @@ -86,7 +87,7 @@ public class OptVillagersRadius implements VillagerOptimizerCommand, TabComplete WrappedVillager wVillager = villagerCache.getOrAdd(villager); - if (wVillager.canOptimize(cooldown)) { + if (player_has_cooldown_bypass || wVillager.canOptimize(cooldown)) { VillagerOptimizeEvent optimizeEvent = new VillagerOptimizeEvent(wVillager, OptimizationType.COMMAND); VillagerOptimizer.callEvent(optimizeEvent); if (!optimizeEvent.isCancelled()) { diff --git a/VillagerOptimizer-1.20.2/src/main/java/me/xginko/villageroptimizer/commands/optimizevillagers/OptVillagersRadius.java b/VillagerOptimizer-1.20.2/src/main/java/me/xginko/villageroptimizer/commands/optimizevillagers/OptVillagersRadius.java index d7516c2..ba5deaf 100644 --- a/VillagerOptimizer-1.20.2/src/main/java/me/xginko/villageroptimizer/commands/optimizevillagers/OptVillagersRadius.java +++ b/VillagerOptimizer-1.20.2/src/main/java/me/xginko/villageroptimizer/commands/optimizevillagers/OptVillagersRadius.java @@ -77,6 +77,7 @@ public class OptVillagersRadius implements VillagerOptimizerCommand, TabComplete VillagerCache villagerCache = VillagerOptimizer.getCache(); int successCount = 0; int failCount = 0; + final boolean player_has_cooldown_bypass = player.hasPermission(Permissions.Bypass.COMMAND_COOLDOWN.get()); for (Entity entity : player.getNearbyEntities(specifiedRadius, specifiedRadius, specifiedRadius)) { if (!entity.getType().equals(EntityType.VILLAGER)) continue; @@ -86,7 +87,7 @@ public class OptVillagersRadius implements VillagerOptimizerCommand, TabComplete WrappedVillager wVillager = villagerCache.getOrAdd(villager); - if (wVillager.canOptimize(cooldown)) { + if (player_has_cooldown_bypass || wVillager.canOptimize(cooldown)) { VillagerOptimizeEvent optimizeEvent = new VillagerOptimizeEvent(wVillager, OptimizationType.COMMAND); VillagerOptimizer.callEvent(optimizeEvent); if (!optimizeEvent.isCancelled()) {