diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/fishing/hook/VanillaMechanic.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/fishing/hook/VanillaMechanic.java
index b730ad58..0e4e67e8 100644
--- a/api/src/main/java/net/momirealms/customfishing/api/mechanic/fishing/hook/VanillaMechanic.java
+++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/fishing/hook/VanillaMechanic.java
@@ -85,18 +85,18 @@ public class VanillaMechanic implements HookMechanic {
     private void setWaitTime(FishHook hook, Effect effect) {
         BukkitCustomFishingPlugin.getInstance().getScheduler().sync().run(() -> {
             if (freeze) {
-                hook.setWaitTime(Integer.MAX_VALUE);
+                SparrowHeart.getInstance().setWaitTime(hook, Integer.MAX_VALUE);
                 return;
             }
             if (!ConfigManager.overrideVanillaWaitTime()) {
-                int before = Math.max(hook.getWaitTime(), 0);
+                int before = Math.max(SparrowHeart.getInstance().getWaitTime(hook), 0);
                 int after = (int) Math.max(100, before * effect.waitTimeMultiplier() + effect.waitTimeAdder());
                 BukkitCustomFishingPlugin.getInstance().debug("Wait time: " + before + " -> " + after + " ticks");
-                hook.setWaitTime(after);
+                SparrowHeart.getInstance().setWaitTime(hook, after);
             } else {
                 int before = ThreadLocalRandom.current().nextInt(ConfigManager.waterMaxTime() - ConfigManager.waterMinTime() + 1) + ConfigManager.waterMinTime();
                 int after = Math.max(ConfigManager.waterMinTime(), (int) (before * effect.waitTimeMultiplier() + effect.waitTimeAdder()));
-                hook.setWaitTime(after);
+                SparrowHeart.getInstance().setWaitTime(hook, after);
                 BukkitCustomFishingPlugin.getInstance().debug("Wait time: " + before + " -> " + after + " ticks");
             }
             int lureTime = RandomUtils.generateRandomInt(20, 80);
@@ -112,7 +112,7 @@ public class VanillaMechanic implements HookMechanic {
                     if (player.isOnline() && hook.isValid()) {
                         AntiAutoFishing.prevent(player, hook);
                     }
-                },  RandomUtils.generateRandomInt(20, hook.getWaitTime() + lureTime - 5), hook.getLocation());
+                },  RandomUtils.generateRandomInt(20, SparrowHeart.getInstance().getWaitTime(hook) + lureTime - 5), hook.getLocation());
             }
         }, hook.getLocation());
     }
@@ -131,17 +131,18 @@ public class VanillaMechanic implements HookMechanic {
     @Override
     public void freeze() {
         freeze = true;
-        if (hook.getWaitTime() > 0) {
-            this.tempWaitTime = hook.getWaitTime();
+        int waitTime = SparrowHeart.getInstance().getWaitTime(hook);
+        if (waitTime > 0) {
+            this.tempWaitTime = waitTime;
         }
-        hook.setWaitTime(Integer.MAX_VALUE);
+        SparrowHeart.getInstance().setWaitTime(hook, Integer.MAX_VALUE);
     }
 
     @Override
     public void unfreeze(Effect effect) {
         freeze = false;
         if (this.tempWaitTime != 0) {
-            hook.setWaitTime(this.tempWaitTime);
+            SparrowHeart.getInstance().setWaitTime(hook, tempWaitTime);
             this.tempWaitTime = 0;
         } else {
             setWaitTime(hook, effect);
diff --git a/gradle.properties b/gradle.properties
index dc866b66..9639eb47 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,6 @@
 # Project settings
 # Rule: [major update].[feature update].[bug fix]
-project_version=2.2.22
+project_version=2.2.23
 config_version=36
 project_group=net.momirealms
 
@@ -17,7 +17,7 @@ h2_driver_version=2.2.224
 sqlite_driver_version=3.46.0.1
 adventure_bundle_version=4.17.0
 adventure_platform_version=4.3.4
-sparrow_heart_version=0.39
+sparrow_heart_version=0.42
 cloud_core_version=2.0.0-rc.2
 cloud_services_version=2.0.0-rc.2
 cloud_brigadier_version=2.0.0-beta.9