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 7439aa0..5f7bf0d 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
@@ -89,8 +89,7 @@ public class OptVillagersRadius implements VillagerOptimizerCommand, TabComplete
 
                     if (player_has_cooldown_bypass || wVillager.canOptimize(cooldown)) {
                         VillagerOptimizeEvent optimizeEvent = new VillagerOptimizeEvent(wVillager, OptimizationType.COMMAND, player);
-                        optimizeEvent.callEvent();
-                        if (!optimizeEvent.isCancelled()) {
+                        if (optimizeEvent.callEvent()) {
                             wVillager.setOptimization(optimizeEvent.getOptimizationType());
                             wVillager.saveOptimizeTime();
                             successCount++;
diff --git a/VillagerOptimizer-1.20.2/src/main/java/me/xginko/villageroptimizer/commands/unoptimizevillagers/UnOptVillagersRadius.java b/VillagerOptimizer-1.20.2/src/main/java/me/xginko/villageroptimizer/commands/unoptimizevillagers/UnOptVillagersRadius.java
index b7da7b0..656cd36 100644
--- a/VillagerOptimizer-1.20.2/src/main/java/me/xginko/villageroptimizer/commands/unoptimizevillagers/UnOptVillagersRadius.java
+++ b/VillagerOptimizer-1.20.2/src/main/java/me/xginko/villageroptimizer/commands/unoptimizevillagers/UnOptVillagersRadius.java
@@ -81,8 +81,7 @@ public class UnOptVillagersRadius implements VillagerOptimizerCommand, TabComple
 
                     if (wVillager.isOptimized()) {
                         VillagerUnoptimizeEvent unOptimizeEvent = new VillagerUnoptimizeEvent(wVillager, player, OptimizationType.COMMAND);
-                        unOptimizeEvent.callEvent();
-                        if (!unOptimizeEvent.isCancelled()) {
+                        if (unOptimizeEvent.callEvent()) {
                             wVillager.setOptimization(OptimizationType.NONE);
                             successCount++;
                         }
diff --git a/VillagerOptimizer-1.20.2/src/main/java/me/xginko/villageroptimizer/modules/optimization/OptimizeByBlock.java b/VillagerOptimizer-1.20.2/src/main/java/me/xginko/villageroptimizer/modules/optimization/OptimizeByBlock.java
index d7e3d36..1ea4b0a 100644
--- a/VillagerOptimizer-1.20.2/src/main/java/me/xginko/villageroptimizer/modules/optimization/OptimizeByBlock.java
+++ b/VillagerOptimizer-1.20.2/src/main/java/me/xginko/villageroptimizer/modules/optimization/OptimizeByBlock.java
@@ -115,8 +115,7 @@ public class OptimizeByBlock implements VillagerOptimizerModule, Listener {
 
         if (closestOptimizableVillager.canOptimize(cooldown) || player.hasPermission(Permissions.Bypass.BLOCK_COOLDOWN.get())) {
             VillagerOptimizeEvent optimizeEvent = new VillagerOptimizeEvent(closestOptimizableVillager, OptimizationType.BLOCK, player, event.isAsynchronous());
-            optimizeEvent.callEvent();
-            if (optimizeEvent.isCancelled()) return;
+            if (!optimizeEvent.callEvent()) return;
 
             closestOptimizableVillager.setOptimization(optimizeEvent.getOptimizationType());
             closestOptimizableVillager.saveOptimizeTime();
@@ -177,8 +176,7 @@ public class OptimizeByBlock implements VillagerOptimizerModule, Listener {
         if (closestOptimizedVillager == null) return;
 
         VillagerUnoptimizeEvent unOptimizeEvent = new VillagerUnoptimizeEvent(closestOptimizedVillager, player, OptimizationType.BLOCK, event.isAsynchronous());
-        unOptimizeEvent.callEvent();
-        if (unOptimizeEvent.isCancelled()) return;
+        if (!unOptimizeEvent.callEvent()) return;
 
         closestOptimizedVillager.setOptimization(OptimizationType.NONE);
 
diff --git a/VillagerOptimizer-1.20.2/src/main/java/me/xginko/villageroptimizer/modules/optimization/OptimizeByNametag.java b/VillagerOptimizer-1.20.2/src/main/java/me/xginko/villageroptimizer/modules/optimization/OptimizeByNametag.java
index d22a4b7..d346eaa 100644
--- a/VillagerOptimizer-1.20.2/src/main/java/me/xginko/villageroptimizer/modules/optimization/OptimizeByNametag.java
+++ b/VillagerOptimizer-1.20.2/src/main/java/me/xginko/villageroptimizer/modules/optimization/OptimizeByNametag.java
@@ -91,8 +91,7 @@ public class OptimizeByNametag implements VillagerOptimizerModule, Listener {
         if (nametags.contains(name.toLowerCase())) {
             if (wVillager.canOptimize(cooldown) || player.hasPermission(Permissions.Bypass.NAMETAG_COOLDOWN.get())) {
                 VillagerOptimizeEvent optimizeEvent = new VillagerOptimizeEvent(wVillager, OptimizationType.NAMETAG, player, event.isAsynchronous());
-                optimizeEvent.callEvent();
-                if (optimizeEvent.isCancelled()) return;
+                if (!optimizeEvent.callEvent()) return;
 
                 if (!consume_nametag) {
                     event.setCancelled(true);
@@ -120,8 +119,7 @@ public class OptimizeByNametag implements VillagerOptimizerModule, Listener {
         } else {
             if (wVillager.isOptimized()) {
                 VillagerUnoptimizeEvent unOptimizeEvent = new VillagerUnoptimizeEvent(wVillager, player, OptimizationType.NAMETAG, event.isAsynchronous());
-                unOptimizeEvent.callEvent();
-                if (unOptimizeEvent.isCancelled()) return;
+                if (!unOptimizeEvent.callEvent()) return;
 
                 wVillager.setOptimization(OptimizationType.NONE);
 
diff --git a/VillagerOptimizer-1.20.2/src/main/java/me/xginko/villageroptimizer/modules/optimization/OptimizeByWorkstation.java b/VillagerOptimizer-1.20.2/src/main/java/me/xginko/villageroptimizer/modules/optimization/OptimizeByWorkstation.java
index 6079103..fe63863 100644
--- a/VillagerOptimizer-1.20.2/src/main/java/me/xginko/villageroptimizer/modules/optimization/OptimizeByWorkstation.java
+++ b/VillagerOptimizer-1.20.2/src/main/java/me/xginko/villageroptimizer/modules/optimization/OptimizeByWorkstation.java
@@ -99,8 +99,7 @@ public class OptimizeByWorkstation implements VillagerOptimizerModule, Listener
 
         if (closestOptimizableVillager.canOptimize(cooldown) || player.hasPermission(Permissions.Bypass.WORKSTATION_COOLDOWN.get())) {
             VillagerOptimizeEvent optimizeEvent = new VillagerOptimizeEvent(closestOptimizableVillager, OptimizationType.WORKSTATION, player, event.isAsynchronous());
-            optimizeEvent.callEvent();
-            if (optimizeEvent.isCancelled()) return;
+            if (!optimizeEvent.callEvent()) return;
 
             closestOptimizableVillager.setOptimization(optimizeEvent.getOptimizationType());
             closestOptimizableVillager.saveOptimizeTime();
@@ -165,8 +164,7 @@ public class OptimizeByWorkstation implements VillagerOptimizerModule, Listener
         if (closestOptimizedVillager == null) return;
 
         VillagerUnoptimizeEvent unOptimizeEvent = new VillagerUnoptimizeEvent(closestOptimizedVillager, player, OptimizationType.WORKSTATION, event.isAsynchronous());
-        unOptimizeEvent.callEvent();
-        if (unOptimizeEvent.isCancelled()) return;
+        if (!unOptimizeEvent.callEvent()) return;
 
         closestOptimizedVillager.setOptimization(OptimizationType.NONE);