diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 5018afda2..32ca87965 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-paper = "1.21.3-R0.1-SNAPSHOT"
+paper = "1.21.4-R0.1-SNAPSHOT"
 junit = "5.8.2"
 nuotifier = "2.7.2"
 
diff --git a/plugins/civduties-paper/build.gradle.kts b/plugins/civduties-paper/build.gradle.kts
index a29d0398a..2263e7fb0 100644
--- a/plugins/civduties-paper/build.gradle.kts
+++ b/plugins/civduties-paper/build.gradle.kts
@@ -12,5 +12,7 @@ dependencies {
     compileOnly(project(":plugins:civmodcore-paper"))
     compileOnly(project(":plugins:combattagplus-paper"))
 
-    compileOnly(libs.vault.api)
+    compileOnly(libs.vault.api) {
+        exclude(group = "org.bukkit")
+    }
 }
diff --git a/plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/nms/NpcPlayerHelperImpl.java b/plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/nms/NpcPlayerHelperImpl.java
index 2f6928490..ca71aac16 100644
--- a/plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/nms/NpcPlayerHelperImpl.java
+++ b/plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/nms/NpcPlayerHelperImpl.java
@@ -45,7 +45,7 @@ public class NpcPlayerHelperImpl implements NpcPlayerHelper {
         npcPlayer.spawnIn(worldServer);
         npcPlayer.forceSetPositionRotation(l.getX(), l.getY(), l.getZ(), l.getYaw(), l.getPitch());
         npcPlayer.gameMode.setLevel(worldServer);
-        npcPlayer.spawnInvulnerableTime = 0;
+        npcPlayer.invulnerableTime = 0;
 
         for (ServerPlayer serverPlayer : MinecraftServer.getServer().getPlayerList().getPlayers()) {
             if (serverPlayer instanceof NpcPlayer) continue;
diff --git a/plugins/finale-paper/src/main/java/com/github/maxopoly/finale/combat/CombatUtil.java b/plugins/finale-paper/src/main/java/com/github/maxopoly/finale/combat/CombatUtil.java
index 4bbfd6418..b542d9acb 100644
--- a/plugins/finale-paper/src/main/java/com/github/maxopoly/finale/combat/CombatUtil.java
+++ b/plugins/finale-paper/src/main/java/com/github/maxopoly/finale/combat/CombatUtil.java
@@ -147,7 +147,7 @@ public class CombatUtil {
 
                                 if (entityliving != attacker && entityliving != victim && !attacker.skipAttackInteraction(entityliving) && (!(entityliving instanceof ArmorStand) || !((ArmorStand) entityliving).isMarker()) && attacker.distanceToSqr(entityliving) < 9.0D) {
                                     // CraftBukkit start - Only apply knockback if the damage hits
-                                    if (entityliving.hurtServer(entityliving.level().getMinecraftWorld(), world.damageSources().playerAttack(attacker).sweep().critical(shouldCrit), f4)) {
+                                    if (entityliving.hurtServer(entityliving.level().getMinecraftWorld(), world.damageSources().playerAttack(attacker), f4)) {
                                         entityliving.knockback(0.4F, (double) Mth.sin(attacker.getBukkitYaw() * 0.017453292F), (double) (-Mth.cos(attacker.getBukkitYaw() * 0.017453292F)));
                                     }
                                     // CraftBukkit end