diff --git a/.bugs b/.bugs
index 97c4f221..4fda6452 100644
--- a/.bugs
+++ b/.bugs
@@ -45,6 +45,7 @@ patched 268420 client basic
 patched 280220 client basic
 patched 298225 client basic
 patched 298558 client basic
+patched 136249 client gameplay
 
 patched 7569 server basic
 patched 8187 server gameplay
@@ -64,7 +65,6 @@ patched 123450 server basic
 patched 129909 server basic
 patched 132878 server basic
 patched 134110 server basic
-patched 136249 server basic
 patched 139041 server basic
 patched 147659 server basic
 patched 155509 server basic
diff --git a/PATCHED.md b/PATCHED.md
index 922852c5..bbdf70e6 100644
--- a/PATCHED.md
+++ b/PATCHED.md
@@ -31,6 +31,7 @@
  | Basic | [MC-122477](https://mojira.dev/MC-122477) | Linux/GNU: Opening chat sometimes writes 't' |
  | Basic | [MC-122627](https://mojira.dev/MC-122627) | Tab suggestion box has missing padding on right side |
  | Basic | [MC-127970](https://mojira.dev/MC-127970) | Using Riptide on a trident with an item in your off-hand causes visual glitch with said item |
+ | Gameplay | [MC-136249](https://mojira.dev/MC-136249) | Wearing boots enchanted with depth strider decreases the strength of the riptide enchantment |
  | Basic | [MC-143474](https://mojira.dev/MC-143474) | Respawning causes your hotbar to reset to the first space |
  | Gameplay | [MC-159163](https://mojira.dev/MC-159163) | Quickly pressing the sneak key causes the sneak animation to play twice |
  | Basic | [MC-165306](https://mojira.dev/MC-165306) |  |
@@ -78,7 +79,6 @@
  | Basic | [MC-132878](https://mojira.dev/MC-132878) | Armor stands destroyed by explosions/lava/fire don't produce particles |
  | Basic | [MC-133218](https://mojira.dev/MC-133218) | Usable items continue to be used on the death screen after dying when the "keepInventory" gamerule is set to "true" |
  | Basic | [MC-134110](https://mojira.dev/MC-134110) | Structure mirroring breaking apart double chests |
- | Basic | [MC-136249](https://mojira.dev/MC-136249) | Wearing boots enchanted with depth strider decreases the strength of the riptide enchantment |
  | Basic | [MC-139041](https://mojira.dev/MC-139041) | The sounds of fishing bobbers aren't controlled by the "Players" sound slider |
  | Basic | [MC-147659](https://mojira.dev/MC-147659) | Some witch huts spawn the incorrect cat |
  | Basic | [MC-153010](https://mojira.dev/MC-153010) | doMobLoot gamerule doesn't prevent foxes from dropping their items |
diff --git a/src/main/java/dev/isxander/debugify/mixins/basic/mc136249/LivingEntityMixin.java b/src/client/java/dev/isxander/debugify/client/mixins/gameplay/mc136249/LivingEntityMixin.java
similarity index 81%
rename from src/main/java/dev/isxander/debugify/mixins/basic/mc136249/LivingEntityMixin.java
rename to src/client/java/dev/isxander/debugify/client/mixins/gameplay/mc136249/LivingEntityMixin.java
index 6a594c3b..372ad7fb 100644
--- a/src/main/java/dev/isxander/debugify/mixins/basic/mc136249/LivingEntityMixin.java
+++ b/src/client/java/dev/isxander/debugify/client/mixins/gameplay/mc136249/LivingEntityMixin.java
@@ -1,4 +1,4 @@
-package dev.isxander.debugify.mixins.basic.mc136249;
+package dev.isxander.debugify.client.mixins.gameplay.mc136249;
 
 import com.llamalad7.mixinextras.expression.Definition;
 import com.llamalad7.mixinextras.expression.Expression;
@@ -10,7 +10,7 @@
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 
-@BugFix(id = "MC-136249", category = FixCategory.BASIC, env = BugFix.Env.SERVER, description = "Wearing boots enchanted with depth strider decreases the strength of the riptide enchantment")
+@BugFix(id = "MC-136249", category = FixCategory.GAMEPLAY, env = BugFix.Env.CLIENT, description = "Wearing boots enchanted with depth strider decreases the strength of the riptide enchantment")
 @Mixin(LivingEntity.class)
 public abstract class LivingEntityMixin{
     @Shadow
diff --git a/src/client/resources/debugify.client.mixins.json b/src/client/resources/debugify.client.mixins.json
index 9aecc2d7..b3df09c6 100644
--- a/src/client/resources/debugify.client.mixins.json
+++ b/src/client/resources/debugify.client.mixins.json
@@ -63,6 +63,7 @@
     "basic.mc188359.CakeBlockMixin",
     "basic.mc188359.ConsumableMixin",
     "basic.mc206540.EntityMixin",
-    "basic.mc259512.LivingEntityMixin"
+    "basic.mc259512.LivingEntityMixin",
+    "gameplay.mc136249.LivingEntityMixin"
   ]
 }
diff --git a/src/main/resources/debugify.mixins.json b/src/main/resources/debugify.mixins.json
index 1aab7cc7..808e37d7 100644
--- a/src/main/resources/debugify.mixins.json
+++ b/src/main/resources/debugify.mixins.json
@@ -20,7 +20,6 @@
     "basic.mc132878.ArmorStandMixin",
     "basic.mc133218.ServerPlayerMixin",
     "basic.mc134110.ChestBlockMixin",
-    "basic.mc136249.LivingEntityMixin",
     "basic.mc139041.FishingRodItemMixin",
     "basic.mc147659.CatSpawnerMixin",
     "basic.mc153010.FoxMixin",