diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8296e93..62ac79f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,2 +1,2 @@
 # Changelog
-- 1.21.3 Support by @Jsinco (removes support for <= 1.21.2)
+- 1.21.4 Support by @funniray (removes support for <= 1.21.3)
diff --git a/Insights-NMS/Current/build.gradle.kts b/Insights-NMS/Current/build.gradle.kts
index e127372..72bd78b 100644
--- a/Insights-NMS/Current/build.gradle.kts
+++ b/Insights-NMS/Current/build.gradle.kts
@@ -1,3 +1,3 @@
 dependencies {
-    paperweight.paperDevBundle("1.21.3-R0.1-SNAPSHOT")
+    paperweight.paperDevBundle("1.21.4-R0.1-SNAPSHOT")
 }
diff --git a/Insights/src/main/java/dev/frankheijden/insights/commands/util/CommandSenderMapper.java b/Insights/src/main/java/dev/frankheijden/insights/commands/util/CommandSenderMapper.java
index ff78c23..df7481c 100644
--- a/Insights/src/main/java/dev/frankheijden/insights/commands/util/CommandSenderMapper.java
+++ b/Insights/src/main/java/dev/frankheijden/insights/commands/util/CommandSenderMapper.java
@@ -18,8 +18,12 @@ public CommandSender map(CommandSourceStack source) {
     @Override
     public CommandSourceStack reverse(CommandSender sender) {
         return new CommandSourceStack() {
+            private Location location = null;
+            private Entity entity = null;
+
             @Override
             public @NotNull Location getLocation() {
+                if (location != null) return location;
                 if (sender instanceof Entity entity) {
                     return entity.getLocation();
                 }
@@ -35,8 +39,22 @@ public CommandSourceStack reverse(CommandSender sender) {
 
             @Override
             public @Nullable Entity getExecutor() {
+                if (entity != null) return entity;
                 return sender instanceof Entity entity ? entity : null;
             }
+
+            // Needs testing
+            @Override
+            public CommandSourceStack withLocation(Location location) {
+                this.location = location;
+                return this;
+            }
+
+            @Override
+            public CommandSourceStack withExecutor(Entity entity) {
+                this.entity = entity;
+                return this;
+            }
         };
     }
 }
diff --git a/build.gradle.kts b/build.gradle.kts
index d722f44..63beab5 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -46,7 +46,7 @@ subprojects {
         maven("https://repo.codemc.io/repository/maven-public")
         maven("https://oss.sonatype.org/content/repositories/snapshots/")
         maven("https://s01.oss.sonatype.org/content/repositories/snapshots/")
-        maven("https://papermc.io/repo/repository/maven-public/")
+        maven("https://repo.papermc.io/repository/maven-public/")
         maven("https://libraries.minecraft.net")
     }
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 6813cb2..32dd77a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 # libraries
 semver = "0.10.2"
-minecraft = "1.21.3-R0.1-SNAPSHOT"
+minecraft = "1.21.4-R0.1-SNAPSHOT"
 paperLib = "1.0.8"
 bStats = "3.0.0"
 adventure = "4.17.0"
@@ -17,7 +17,7 @@ cloud = "2.0.0-rc.2"
 
 # plugins
 shadow = "9.0.0-beta2"
-userdev = "1.7.5"
+userdev = "2.0.0-beta.13"
 pluginYml = "0.6.0"
 
 [libraries]
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 20db9ad..18362b7 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists