diff --git a/VillagerOptimizer-1.16.5/src/main/java/me/xginko/villageroptimizer/VillagerOptimizer.java b/VillagerOptimizer-1.16.5/src/main/java/me/xginko/villageroptimizer/VillagerOptimizer.java
index 3c65b5c..6a9016f 100644
--- a/VillagerOptimizer-1.16.5/src/main/java/me/xginko/villageroptimizer/VillagerOptimizer.java
+++ b/VillagerOptimizer-1.16.5/src/main/java/me/xginko/villageroptimizer/VillagerOptimizer.java
@@ -14,7 +14,6 @@ import org.bukkit.NamespacedKey;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.ConsoleCommandSender;
 import org.bukkit.entity.Player;
-import org.bukkit.event.Event;
 import org.bukkit.plugin.java.JavaPlugin;
 
 import java.io.File;
@@ -96,9 +95,6 @@ public final class VillagerOptimizer extends JavaPlugin {
     public static LanguageCache getLang(String lang) {
         return config.auto_lang ? languageCacheMap.getOrDefault(lang.replace("-", "_"), languageCacheMap.get(config.default_lang.toString().toLowerCase())) : languageCacheMap.get(config.default_lang.toString().toLowerCase());
     }
-    public static void callEvent(Event event) {
-        instance.getServer().getPluginManager().callEvent(event);
-    }
 
     public void reloadPlugin() {
         reloadLang(false);
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 c1c2c83..7439aa0 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
@@ -89,7 +89,7 @@ public class OptVillagersRadius implements VillagerOptimizerCommand, TabComplete
 
                     if (player_has_cooldown_bypass || wVillager.canOptimize(cooldown)) {
                         VillagerOptimizeEvent optimizeEvent = new VillagerOptimizeEvent(wVillager, OptimizationType.COMMAND, player);
-                        VillagerOptimizer.callEvent(optimizeEvent);
+                        optimizeEvent.callEvent();
                         if (!optimizeEvent.isCancelled()) {
                             wVillager.setOptimization(optimizeEvent.getOptimizationType());
                             wVillager.saveOptimizeTime();
diff --git a/VillagerOptimizer-1.16.5/src/main/java/me/xginko/villageroptimizer/commands/unoptimizevillagers/UnOptVillagersRadius.java b/VillagerOptimizer-1.16.5/src/main/java/me/xginko/villageroptimizer/commands/unoptimizevillagers/UnOptVillagersRadius.java
index f113467..b7da7b0 100644
--- a/VillagerOptimizer-1.16.5/src/main/java/me/xginko/villageroptimizer/commands/unoptimizevillagers/UnOptVillagersRadius.java
+++ b/VillagerOptimizer-1.16.5/src/main/java/me/xginko/villageroptimizer/commands/unoptimizevillagers/UnOptVillagersRadius.java
@@ -81,7 +81,7 @@ public class UnOptVillagersRadius implements VillagerOptimizerCommand, TabComple
 
                     if (wVillager.isOptimized()) {
                         VillagerUnoptimizeEvent unOptimizeEvent = new VillagerUnoptimizeEvent(wVillager, player, OptimizationType.COMMAND);
-                        VillagerOptimizer.callEvent(unOptimizeEvent);
+                        unOptimizeEvent.callEvent();
                         if (!unOptimizeEvent.isCancelled()) {
                             wVillager.setOptimization(OptimizationType.NONE);
                             successCount++;
diff --git a/VillagerOptimizer-1.16.5/src/main/java/me/xginko/villageroptimizer/modules/optimization/OptimizeByBlock.java b/VillagerOptimizer-1.16.5/src/main/java/me/xginko/villageroptimizer/modules/optimization/OptimizeByBlock.java
index d5f1025..5e1a15b 100644
--- a/VillagerOptimizer-1.16.5/src/main/java/me/xginko/villageroptimizer/modules/optimization/OptimizeByBlock.java
+++ b/VillagerOptimizer-1.16.5/src/main/java/me/xginko/villageroptimizer/modules/optimization/OptimizeByBlock.java
@@ -109,7 +109,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());
-            VillagerOptimizer.callEvent(optimizeEvent);
+            optimizeEvent.callEvent();
             if (optimizeEvent.isCancelled()) return;
 
             closestOptimizableVillager.setOptimization(optimizeEvent.getOptimizationType());
@@ -170,7 +170,7 @@ public class OptimizeByBlock implements VillagerOptimizerModule, Listener {
         if (closestOptimizedVillager == null) return;
 
         VillagerUnoptimizeEvent unOptimizeEvent = new VillagerUnoptimizeEvent(closestOptimizedVillager, player, OptimizationType.BLOCK, event.isAsynchronous());
-        VillagerOptimizer.callEvent(unOptimizeEvent);
+        unOptimizeEvent.callEvent();
         if (unOptimizeEvent.isCancelled()) return;
 
         closestOptimizedVillager.setOptimization(OptimizationType.NONE);
diff --git a/VillagerOptimizer-1.16.5/src/main/java/me/xginko/villageroptimizer/modules/optimization/OptimizeByNametag.java b/VillagerOptimizer-1.16.5/src/main/java/me/xginko/villageroptimizer/modules/optimization/OptimizeByNametag.java
index 399f750..5846a16 100644
--- a/VillagerOptimizer-1.16.5/src/main/java/me/xginko/villageroptimizer/modules/optimization/OptimizeByNametag.java
+++ b/VillagerOptimizer-1.16.5/src/main/java/me/xginko/villageroptimizer/modules/optimization/OptimizeByNametag.java
@@ -85,7 +85,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());
-                VillagerOptimizer.callEvent(optimizeEvent);
+                optimizeEvent.callEvent();
                 if (optimizeEvent.isCancelled()) return;
 
                 if (!consume_nametag) {
@@ -113,7 +113,7 @@ public class OptimizeByNametag implements VillagerOptimizerModule, Listener {
         } else {
             if (wVillager.isOptimized()) {
                 VillagerUnoptimizeEvent unOptimizeEvent = new VillagerUnoptimizeEvent(wVillager, player, OptimizationType.NAMETAG, event.isAsynchronous());
-                VillagerOptimizer.callEvent(unOptimizeEvent);
+                unOptimizeEvent.callEvent();
                 if (unOptimizeEvent.isCancelled()) return;
 
                 wVillager.setOptimization(OptimizationType.NONE);
diff --git a/VillagerOptimizer-1.16.5/src/main/java/me/xginko/villageroptimizer/modules/optimization/OptimizeByWorkstation.java b/VillagerOptimizer-1.16.5/src/main/java/me/xginko/villageroptimizer/modules/optimization/OptimizeByWorkstation.java
index 07adeef..9f86154 100644
--- a/VillagerOptimizer-1.16.5/src/main/java/me/xginko/villageroptimizer/modules/optimization/OptimizeByWorkstation.java
+++ b/VillagerOptimizer-1.16.5/src/main/java/me/xginko/villageroptimizer/modules/optimization/OptimizeByWorkstation.java
@@ -93,7 +93,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());
-            VillagerOptimizer.callEvent(optimizeEvent);
+            optimizeEvent.callEvent();
             if (optimizeEvent.isCancelled()) return;
 
             closestOptimizableVillager.setOptimization(optimizeEvent.getOptimizationType());
@@ -158,7 +158,7 @@ public class OptimizeByWorkstation implements VillagerOptimizerModule, Listener
         if (closestOptimizedVillager == null) return;
 
         VillagerUnoptimizeEvent unOptimizeEvent = new VillagerUnoptimizeEvent(closestOptimizedVillager, player, OptimizationType.WORKSTATION, event.isAsynchronous());
-        VillagerOptimizer.callEvent(unOptimizeEvent);
+        unOptimizeEvent.callEvent();
         if (unOptimizeEvent.isCancelled()) return;
 
         closestOptimizedVillager.setOptimization(OptimizationType.NONE);
diff --git a/VillagerOptimizer-1.20.2/src/main/java/me/xginko/villageroptimizer/VillagerOptimizer.java b/VillagerOptimizer-1.20.2/src/main/java/me/xginko/villageroptimizer/VillagerOptimizer.java
index 3c65b5c..6a9016f 100644
--- a/VillagerOptimizer-1.20.2/src/main/java/me/xginko/villageroptimizer/VillagerOptimizer.java
+++ b/VillagerOptimizer-1.20.2/src/main/java/me/xginko/villageroptimizer/VillagerOptimizer.java
@@ -14,7 +14,6 @@ import org.bukkit.NamespacedKey;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.ConsoleCommandSender;
 import org.bukkit.entity.Player;
-import org.bukkit.event.Event;
 import org.bukkit.plugin.java.JavaPlugin;
 
 import java.io.File;
@@ -96,9 +95,6 @@ public final class VillagerOptimizer extends JavaPlugin {
     public static LanguageCache getLang(String lang) {
         return config.auto_lang ? languageCacheMap.getOrDefault(lang.replace("-", "_"), languageCacheMap.get(config.default_lang.toString().toLowerCase())) : languageCacheMap.get(config.default_lang.toString().toLowerCase());
     }
-    public static void callEvent(Event event) {
-        instance.getServer().getPluginManager().callEvent(event);
-    }
 
     public void reloadPlugin() {
         reloadLang(false);
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 c1c2c83..7439aa0 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,7 +89,7 @@ public class OptVillagersRadius implements VillagerOptimizerCommand, TabComplete
 
                     if (player_has_cooldown_bypass || wVillager.canOptimize(cooldown)) {
                         VillagerOptimizeEvent optimizeEvent = new VillagerOptimizeEvent(wVillager, OptimizationType.COMMAND, player);
-                        VillagerOptimizer.callEvent(optimizeEvent);
+                        optimizeEvent.callEvent();
                         if (!optimizeEvent.isCancelled()) {
                             wVillager.setOptimization(optimizeEvent.getOptimizationType());
                             wVillager.saveOptimizeTime();
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 f113467..b7da7b0 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,7 +81,7 @@ public class UnOptVillagersRadius implements VillagerOptimizerCommand, TabComple
 
                     if (wVillager.isOptimized()) {
                         VillagerUnoptimizeEvent unOptimizeEvent = new VillagerUnoptimizeEvent(wVillager, player, OptimizationType.COMMAND);
-                        VillagerOptimizer.callEvent(unOptimizeEvent);
+                        unOptimizeEvent.callEvent();
                         if (!unOptimizeEvent.isCancelled()) {
                             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 29f7593..d7e3d36 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,7 +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());
-            VillagerOptimizer.callEvent(optimizeEvent);
+            optimizeEvent.callEvent();
             if (optimizeEvent.isCancelled()) return;
 
             closestOptimizableVillager.setOptimization(optimizeEvent.getOptimizationType());
@@ -177,7 +177,7 @@ public class OptimizeByBlock implements VillagerOptimizerModule, Listener {
         if (closestOptimizedVillager == null) return;
 
         VillagerUnoptimizeEvent unOptimizeEvent = new VillagerUnoptimizeEvent(closestOptimizedVillager, player, OptimizationType.BLOCK, event.isAsynchronous());
-        VillagerOptimizer.callEvent(unOptimizeEvent);
+        unOptimizeEvent.callEvent();
         if (unOptimizeEvent.isCancelled()) 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 7646d05..d22a4b7 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,7 +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());
-                VillagerOptimizer.callEvent(optimizeEvent);
+                optimizeEvent.callEvent();
                 if (optimizeEvent.isCancelled()) return;
 
                 if (!consume_nametag) {
@@ -120,7 +120,7 @@ public class OptimizeByNametag implements VillagerOptimizerModule, Listener {
         } else {
             if (wVillager.isOptimized()) {
                 VillagerUnoptimizeEvent unOptimizeEvent = new VillagerUnoptimizeEvent(wVillager, player, OptimizationType.NAMETAG, event.isAsynchronous());
-                VillagerOptimizer.callEvent(unOptimizeEvent);
+                unOptimizeEvent.callEvent();
                 if (unOptimizeEvent.isCancelled()) 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 8357610..6079103 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,7 +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());
-            VillagerOptimizer.callEvent(optimizeEvent);
+            optimizeEvent.callEvent();
             if (optimizeEvent.isCancelled()) return;
 
             closestOptimizableVillager.setOptimization(optimizeEvent.getOptimizationType());
@@ -165,7 +165,7 @@ public class OptimizeByWorkstation implements VillagerOptimizerModule, Listener
         if (closestOptimizedVillager == null) return;
 
         VillagerUnoptimizeEvent unOptimizeEvent = new VillagerUnoptimizeEvent(closestOptimizedVillager, player, OptimizationType.WORKSTATION, event.isAsynchronous());
-        VillagerOptimizer.callEvent(unOptimizeEvent);
+        unOptimizeEvent.callEvent();
         if (unOptimizeEvent.isCancelled()) return;
 
         closestOptimizedVillager.setOptimization(OptimizationType.NONE);