diff --git a/gradle.properties b/gradle.properties
index 5feac6a43..2ad60942b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
 version = 1.20.6-R0.1-SNAPSHOT
 
 mcVersion = 1.20.6
-paperCommit = 79e2cb620ef03539390d97940824b38b707918f5
+paperCommit = e41d44fa873466064879ebed476d280932379a9c
 
 org.gradle.caching = true
 org.gradle.parallel = true
diff --git a/patches/server/0003-Purpur-client-support.patch b/patches/server/0003-Purpur-client-support.patch
index 638ca8728..497e6b5d4 100644
--- a/patches/server/0003-Purpur-client-support.patch
+++ b/patches/server/0003-Purpur-client-support.patch
@@ -43,10 +43,10 @@ index 308aef9c4933b2bcdd622a34b68efab4a220fe4d..a8edeb5a40cd9aac933805259407e32c
              try {
                  String channels = payload.toString(com.google.common.base.Charsets.UTF_8);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 40155cc70ba959eea8011626a30e26f44298c99d..69de5167aeaa6f9cb66fa7c2daa63a2e72c93fd0 100644
+index 32c3c2c6b2eaa90b149d9b425341e75b85bd9764..5489247bed3096a0cdb472a0ee26cb16f19f9e14 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -3528,4 +3528,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3529,4 +3529,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void setSendViewDistance(final int viewDistance) {
          this.getHandle().setSendViewDistance(viewDistance);
      }
diff --git a/patches/server/0010-AFK-API.patch b/patches/server/0010-AFK-API.patch
index 25433b8aa..38bd594a4 100644
--- a/patches/server/0010-AFK-API.patch
+++ b/patches/server/0010-AFK-API.patch
@@ -223,7 +223,7 @@ index ea0aee88c7d901034427db201c1b2430f8a1d522..1f28bfb435c1e4d97da713f96c452aba
                  if (range < 0.0 || d < range * range) {
                      return true;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 69de5167aeaa6f9cb66fa7c2daa63a2e72c93fd0..5ace17f1bc7b6c5c99849ac5a650de4205c7fbbd 100644
+index 5489247bed3096a0cdb472a0ee26cb16f19f9e14..35635eb9f0315b7db3d176fcd0912fbe9309b4ef 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -574,10 +574,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -243,7 +243,7 @@ index 69de5167aeaa6f9cb66fa7c2daa63a2e72c93fd0..5ace17f1bc7b6c5c99849ac5a650de42
          if (this.getHandle().connection == null) return; // Paper - Updates are possible before the player has fully joined
          for (ServerPlayer player : (List<ServerPlayer>) this.server.getHandle().players) {
              if (player.getBukkitEntity().canSee(this)) {
-@@ -3534,5 +3539,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3535,5 +3540,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public boolean usesPurpurClient() {
          return getHandle().purpurClient;
      }
@@ -288,7 +288,7 @@ index db0d57060cae1f5fd51087a15134ca5f389511bc..d2f3e864aa4d1c5d3ee8bb8f1e36787b
  
      public static int barrelRows = 3;
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index e248395ad5f5f012aeefecf367d54f90cade0996..70f53ccb22de2c05c9ead68f8bd29d0b69d0993f 100644
+index 767d977cf47b0c7d94c248091f3ce98d6383ae04..2f2986f9f7a241c4d7a1e065126dbbae601f7fe5 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -90,6 +90,24 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0041-Skip-events-if-there-s-no-listeners.patch b/patches/server/0041-Skip-events-if-there-s-no-listeners.patch
index ae08f77b2..422b879c9 100644
--- a/patches/server/0041-Skip-events-if-there-s-no-listeners.patch
+++ b/patches/server/0041-Skip-events-if-there-s-no-listeners.patch
@@ -5,13 +5,13 @@ Subject: [PATCH] Skip events if there's no listeners
 
 
 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index 0126906e2afc8dd525f27a0c5e82116075c9d352..758fe6a1d197cf9ea1f1c959eb6bf8091fe2cccf 100644
+index 134befa037177b47dbda1ba033251d901bdbcd3f..05fe22ca968902c0bf5206ee8bd2ece39fc82eab 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
 @@ -520,6 +520,7 @@ public class Commands {
      private void runSync(ServerPlayer player, Collection<String> bukkit, RootCommandNode<SharedSuggestionProvider> rootcommandnode) {
          // Paper end - Perf: Async command map building
-         new com.destroystokyo.paper.event.brigadier.AsyncPlayerSendCommandsEvent<CommandSourceStack>(player.getBukkitEntity(), (RootCommandNode) rootcommandnode, false).callEvent(); // Paper - Brigadier API
+         new com.destroystokyo.paper.event.brigadier.AsyncPlayerSendCommandsEvent<CommandSourceStack>(player.getBukkitEntity(), (RootCommandNode) rootcommandnode, true).callEvent(); // Paper - Brigadier API
 +        if (PlayerCommandSendEvent.getHandlerList().getRegisteredListeners().length > 0) { // Purpur - skip all this crap if there's nothing listening
          PlayerCommandSendEvent event = new PlayerCommandSendEvent(player.getBukkitEntity(), new LinkedHashSet<>(bukkit));
          event.getPlayer().getServer().getPluginManager().callEvent(event);
diff --git a/patches/server/0120-Add-EntityTeleportHinderedEvent.patch b/patches/server/0120-Add-EntityTeleportHinderedEvent.patch
index c3a3264a8..bc6ad1fdb 100644
--- a/patches/server/0120-Add-EntityTeleportHinderedEvent.patch
+++ b/patches/server/0120-Add-EntityTeleportHinderedEvent.patch
@@ -89,10 +89,10 @@ index a6268b3df9691278606501284b5504da718703c2..befe3372d5f1550b7bde3b63b5e7aef9
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index a4e4babedbf5bbf09bfbabd4f55ecd6301dae302..925b8260bb2b1c94e544d6e082ea3b02e613d224 100644
+index 35635eb9f0315b7db3d176fcd0912fbe9309b4ef..e44f1331c82d76ac1a72f93205cf3fe68d20230f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1443,6 +1443,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1444,6 +1444,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
  
          if (entity.isVehicle() && !ignorePassengers) { // Paper - Teleport API
@@ -104,7 +104,7 @@ index a4e4babedbf5bbf09bfbabd4f55ecd6301dae302..925b8260bb2b1c94e544d6e082ea3b02
          }
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 30a95d4b18964c6b25beb4dbec84f03effc2145b..bed0ee3cac8d2acda872f5f3fcbd2b75a6ca3a0d 100644
+index 818d6c507faea7b8b640e0e7eeecf92fc99310b0..3bbe2d4397de4a3befd3a70c4215d283a6fa32d3 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -117,6 +117,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0202-Extended-OfflinePlayer-API.patch b/patches/server/0202-Extended-OfflinePlayer-API.patch
index 55ff89e46..74aa3efc9 100644
--- a/patches/server/0202-Extended-OfflinePlayer-API.patch
+++ b/patches/server/0202-Extended-OfflinePlayer-API.patch
@@ -243,10 +243,10 @@ index 9d93130f23addb18b97d7f5ec013faef17a74529..29d2fb87a65778926aea2cfc7a5b486c
 +    // Purpur end - OfflinePlayer API
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 59b55669d4e9592f6205a0b9f49f8db3b3e5fd92..20543386332d782327229e570c18425dcb98fba4 100644
+index e44f1331c82d76ac1a72f93205cf3fe68d20230f..113206b8ba74bac52cfa44d9b535bbba2b73cd64 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2742,6 +2742,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2743,6 +2743,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return this.getHandle().getAbilities().walkingSpeed * 2f;
      }
  
diff --git a/patches/server/0258-Debug-Marker-API.patch b/patches/server/0258-Debug-Marker-API.patch
index b385954c2..e43866691 100644
--- a/patches/server/0258-Debug-Marker-API.patch
+++ b/patches/server/0258-Debug-Marker-API.patch
@@ -99,10 +99,10 @@ index 60924e7fbba91819f0794a44f0777158962f0d3f..523a6afd7f1dcb0b4ddf5ede0415487c
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 731e879a3c7c9c4c5199216ec1033bc8001b6460..69f39d2df0fac329881401bc5b0391c18eb38096 100644
+index 113206b8ba74bac52cfa44d9b535bbba2b73cd64..ddb8d8313ba250d9d37e5d97033ef1dda213b027 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -3580,5 +3580,43 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3581,5 +3581,43 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void resetIdleTimer() {
          getHandle().resetLastActionTime();
      }
diff --git a/patches/server/0261-Add-death-screen-API.patch b/patches/server/0261-Add-death-screen-API.patch
index 36d892d3d..f44b247a3 100644
--- a/patches/server/0261-Add-death-screen-API.patch
+++ b/patches/server/0261-Add-death-screen-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add death screen API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 69f39d2df0fac329881401bc5b0391c18eb38096..8211ec2c701687d8e5334156772cf435b89f3cb3 100644
+index ddb8d8313ba250d9d37e5d97033ef1dda213b027..aac21ff5418f76b0d06b6a49a4021bde194cf1da 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -3618,5 +3618,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3619,5 +3619,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          if (this.getHandle().connection == null) return;
          this.getHandle().connection.send(new net.minecraft.network.protocol.common.ClientboundCustomPayloadPacket(new net.minecraft.network.protocol.common.custom.GameTestClearMarkersDebugPayload()));
      }