diff --git a/Paper b/Paper
index a62238a99..97b2eadf1 160000
--- a/Paper
+++ b/Paper
@@ -1 +1 @@
-Subproject commit a62238a9985df73bddfff2f31d069354f13c2369
+Subproject commit 97b2eadf17ff7f83e17f223de1b845ca6b291c62
diff --git a/patches/server/0001-Tuinity-Server-Changes.patch b/patches/server/0001-Tuinity-Server-Changes.patch
index 69393c69a..a07062fa9 100644
--- a/patches/server/0001-Tuinity-Server-Changes.patch
+++ b/patches/server/0001-Tuinity-Server-Changes.patch
@@ -12958,7 +12958,7 @@ index 7ea293f38dedd6066601d94adbe175a31c502e1f..e698dd22607b2b2c4068c5bfb03ac53e
              });
              throw CancelledPacketHandleException.INSTANCE;
 diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
-index 485b609bb5387b0f8a46c1201177cdc6d183ad91..614cfacb1e8ac5d68f0ce931933fac5d71ca39c9 100644
+index 114e986e5132e5e4bb42d0f08a067429bce53ba6..05656ea8448aa569e8dd480461e2d5f70d01568b 100644
 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
 +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
 @@ -21,14 +21,29 @@ public class PlayerInteractManager {
diff --git a/patches/server/0109-Ridables.patch b/patches/server/0109-Ridables.patch
index c99c39a6c..2e0ee5f9b 100644
--- a/patches/server/0109-Ridables.patch
+++ b/patches/server/0109-Ridables.patch
@@ -6383,10 +6383,10 @@ index a6d849facba1526ae2a2b7f3fb9a140d0b50289c..b56ca054b37f5887e13b481baad8132f
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 4534d22aec95cf247daf7575472acd0eba91a3c9..3edc530ec688047ae037303442a16e8c5e2e72d4 100644
+index c762015e1402b59bf28dae7f947e7737fbac5c1d..956809378997df0aa7c912106799bfdaaed97a53 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -498,6 +498,18 @@ public class CraftEventFactory {
+@@ -509,6 +509,18 @@ public class CraftEventFactory {
          }
          craftServer.getPluginManager().callEvent(event);
  
@@ -6405,7 +6405,7 @@ index 4534d22aec95cf247daf7575472acd0eba91a3c9..3edc530ec688047ae037303442a16e8c
          return event;
      }
  
-@@ -898,6 +910,7 @@ public class CraftEventFactory {
+@@ -909,6 +921,7 @@ public class CraftEventFactory {
                      damageCause = DamageCause.ENTITY_EXPLOSION;
                  }
                  event = new EntityDamageByEntityEvent(damager.getBukkitEntity(), entity.getBukkitEntity(), damageCause, modifiers, modifierFunctions);
@@ -6413,7 +6413,7 @@ index 4534d22aec95cf247daf7575472acd0eba91a3c9..3edc530ec688047ae037303442a16e8c
              }
              event.setCancelled(cancelled);
  
-@@ -982,6 +995,7 @@ public class CraftEventFactory {
+@@ -993,6 +1006,7 @@ public class CraftEventFactory {
              if (!event.isCancelled()) {
                  event.getEntity().setLastDamageCause(event);
              }
@@ -6421,7 +6421,7 @@ index 4534d22aec95cf247daf7575472acd0eba91a3c9..3edc530ec688047ae037303442a16e8c
              return event;
          }
  
-@@ -1031,6 +1045,7 @@ public class CraftEventFactory {
+@@ -1042,6 +1056,7 @@ public class CraftEventFactory {
          EntityDamageEvent event;
          if (damager != null) {
              event = new EntityDamageByEntityEvent(damager.getBukkitEntity(), damagee.getBukkitEntity(), cause, modifiers, modifierFunctions);
diff --git a/patches/server/0138-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch b/patches/server/0138-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch
index ad2a614a4..f85edd61a 100644
--- a/patches/server/0138-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch
+++ b/patches/server/0138-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch
@@ -33,10 +33,10 @@ index 9963cef9298eb6d3e2ee6a24d9b1998e765123ac..a72ce4ea5a45fce35a47fd5f9c21b950
                      if (flag5) {
                          if (i > 0) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 3edc530ec688047ae037303442a16e8c5e2e72d4..0d9c4d2a427a3484db1f87476be43c03dd36621d 100644
+index 956809378997df0aa7c912106799bfdaaed97a53..9c09d4c2f5b4d34fbf340db5b5bb6b860a25bd08 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1044,7 +1044,7 @@ public class CraftEventFactory {
+@@ -1055,7 +1055,7 @@ public class CraftEventFactory {
      private static EntityDamageEvent callEntityDamageEvent(Entity damager, Entity damagee, DamageCause cause, Map<DamageModifier, Double> modifiers, Map<DamageModifier, Function<? super Double, Double>> modifierFunctions, boolean cancelled) {
          EntityDamageEvent event;
          if (damager != null) {
diff --git a/patches/server/0164-Fix-rotating-UP-DOWN-CW-and-CCW.patch b/patches/server/0164-Fix-rotating-UP-DOWN-CW-and-CCW.patch
index eb4d2fd2e..80dcce4c2 100644
--- a/patches/server/0164-Fix-rotating-UP-DOWN-CW-and-CCW.patch
+++ b/patches/server/0164-Fix-rotating-UP-DOWN-CW-and-CCW.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix rotating UP/DOWN CW and CCW
 
 
 diff --git a/src/main/java/net/minecraft/server/BlockFireAbstract.java b/src/main/java/net/minecraft/server/BlockFireAbstract.java
-index 5727b6f8d94040868ba752ea186b8e8995e189b6..172e4b3eeecc3808a335b80bb44bc6be3d8dd33d 100644
+index 392d27916b929881ff05f94325184acc6f0d7b7a..9c42b5df5839ed1759391270bcc6f240388ddd04 100644
 --- a/src/main/java/net/minecraft/server/BlockFireAbstract.java
 +++ b/src/main/java/net/minecraft/server/BlockFireAbstract.java
-@@ -109,11 +109,7 @@ public abstract class BlockFireAbstract extends Block {
+@@ -115,11 +115,7 @@ public abstract class BlockFireAbstract extends Block {
                      break;
                  }
              }