diff --git a/bukkit/paper-loader/src/main/java/net/momirealms/craftengine/bukkit/plugin/PaperCraftEngineBootstrap.java b/bukkit/paper-loader/src/main/java/net/momirealms/craftengine/bukkit/plugin/PaperCraftEngineBootstrap.java
index 5bde06f9e..1af1956bf 100644
--- a/bukkit/paper-loader/src/main/java/net/momirealms/craftengine/bukkit/plugin/PaperCraftEngineBootstrap.java
+++ b/bukkit/paper-loader/src/main/java/net/momirealms/craftengine/bukkit/plugin/PaperCraftEngineBootstrap.java
@@ -46,15 +46,15 @@ public class PaperCraftEngineBootstrap implements PluginBootstrap {
         );
         this.plugin.applyDependencies();
         this.plugin.setUpConfig();
-//        if (VersionHelper.isOrAbove1_21_4()) {
-//            new ModernEventHandler(context, this.plugin).register();
-//        } else {
+        if (VersionHelper.isOrAbove1_21_4()) {
+            new ModernEventHandler(context, this.plugin).register();
+        } else {
             try {
                 RuntimePatcher.patch(this.plugin);
             } catch (Exception e) {
                 throw new RuntimeException("Failed to patch server", e);
             }
-//        }
+        }
     }
 
     @Override
diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/agent/BlocksAgent.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/agent/BlocksAgent.java
index c1390014a..cac4429ba 100644
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/agent/BlocksAgent.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/agent/BlocksAgent.java
@@ -8,7 +8,7 @@ import java.lang.instrument.Instrumentation;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 
-public class BlocksAgent {
+public final class BlocksAgent {
 
     public static void agentmain(String args, Instrumentation instrumentation) {
         new AgentBuilder.Default()