diff --git a/gradle.properties b/gradle.properties
index 8d748be32..5a845e42f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,7 +4,7 @@ version = 1.17.1-R0.1-SNAPSHOT
 mcVersion = 1.17.1
 packageVersion = 1_17_R1
 
-paperCommit = 321dd1d655f988f7c7764fd8e6c4fc026c2e7a9e
+paperCommit = 7a5025d4617f5946e8ec3af1654d2b22693eab49
 
 org.gradle.caching = true
 org.gradle.parallel = true
diff --git a/patches/api/0012-LivingEntity-safeFallDistance.patch b/patches/api/0012-LivingEntity-safeFallDistance.patch
index ed1002474..1ab70d631 100644
--- a/patches/api/0012-LivingEntity-safeFallDistance.patch
+++ b/patches/api/0012-LivingEntity-safeFallDistance.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] LivingEntity safeFallDistance
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index cda05df6784dd4d6a09710a416dcb71c016dabfc..fa0bd6b4f5a19724723cd7d1c76b0a098dceb3c6 100644
+index 31353bd20404a8c2acf6bf0df524dc3cae324272..e532430b7444cef4e383b3afb637cc6060d8686a 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -880,4 +880,20 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -910,4 +910,20 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       */
      void setHurtDirection(float hurtDirection);
      // Paper end
diff --git a/patches/api/0020-ItemStack-convenience-methods.patch b/patches/api/0020-ItemStack-convenience-methods.patch
index b61d417ff..c6c40598a 100644
--- a/patches/api/0020-ItemStack-convenience-methods.patch
+++ b/patches/api/0020-ItemStack-convenience-methods.patch
@@ -50,7 +50,7 @@ index d635c4fb85d3eeea3853037b2da5881c4853b193..a51f4a3f77cfb946dc3b9fc8e367d6f0
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index a7909406e9d54c1ab4789b984ed6b1da50837fce..ac2967eac165d74c8ee7e0e9ac63124a10851a0e 100644
+index 14cdc64334d6a19102eca6d7d724c35aecf1c1e2..bbf0f3c1cddb3b11020a80424a4dbca1b53f1c2c 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -17,6 +17,18 @@ import org.bukkit.inventory.meta.ItemMeta;
@@ -72,7 +72,7 @@ index a7909406e9d54c1ab4789b984ed6b1da50837fce..ac2967eac165d74c8ee7e0e9ac63124a
  
  /**
   * Represents a stack of items.
-@@ -921,4 +933,626 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, net.kyor
+@@ -922,4 +934,626 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, net.kyor
          return Bukkit.getUnsafe().isValidRepairItemStack(toBeRepaired, this);
      }
      // Paper end
diff --git a/patches/api/0023-LivingEntity-broadcastItemBreak.patch b/patches/api/0023-LivingEntity-broadcastItemBreak.patch
index 2fbc61607..937fb9c0c 100644
--- a/patches/api/0023-LivingEntity-broadcastItemBreak.patch
+++ b/patches/api/0023-LivingEntity-broadcastItemBreak.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] LivingEntity#broadcastItemBreak
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index fa0bd6b4f5a19724723cd7d1c76b0a098dceb3c6..86dd7fbbd98f32f164a15b5b2e9cf6f4664fbef1 100644
+index e532430b7444cef4e383b3afb637cc6060d8686a..0f9dbacb6851b27b2e5b1aa1cf994ccb313f0f45 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -895,5 +895,12 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -925,5 +925,12 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       * @param safeFallDistance Safe fall distance
       */
      void setSafeFallDistance(float safeFallDistance);
diff --git a/patches/api/0041-API-for-any-mob-to-burn-daylight.patch b/patches/api/0041-API-for-any-mob-to-burn-daylight.patch
index 0dcced6b7..a1187955b 100644
--- a/patches/api/0041-API-for-any-mob-to-burn-daylight.patch
+++ b/patches/api/0041-API-for-any-mob-to-burn-daylight.patch
@@ -23,10 +23,10 @@ index 0b8357f012e3bafcd3b5fb4043392b42cf5cfc2a..c9d64da90a05f252d91dd10d2d5f62ba
      // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 86dd7fbbd98f32f164a15b5b2e9cf6f4664fbef1..90e8c4bc68d1563061b6c6efc5e9040735c67dcd 100644
+index 0f9dbacb6851b27b2e5b1aa1cf994ccb313f0f45..bbae010cedf30d0e3336a8f03ee00a0a824cb08d 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -902,5 +902,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -932,5 +932,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       * @param slot Equipment slot to play break animation for
       */
      void broadcastItemBreak(@NotNull org.bukkit.inventory.EquipmentSlot slot);
diff --git a/patches/server/0014-LivingEntity-safeFallDistance.patch b/patches/server/0014-LivingEntity-safeFallDistance.patch
index d3ce8719e..125cdb131 100644
--- a/patches/server/0014-LivingEntity-safeFallDistance.patch
+++ b/patches/server/0014-LivingEntity-safeFallDistance.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] LivingEntity safeFallDistance
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index ebb891dd292f4f1496bf740947b2061a1490073f..ef9cb7eba59e4a1f730cc608d7aece77de8b0e4d 100644
+index cecffa5879f386e99ccd27386f90074aef0b72fe..c59882224b44d1d477ca8d84155b7f3b9f7da0ce 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -255,6 +255,7 @@ public abstract class LivingEntity extends Entity {
@@ -62,10 +62,10 @@ index c67f33f2e2e0ff5c2a85782185103325a6bf4535..a8ffdc8810152d77668aad7bad15a00c
  
      // Purpur start
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 53b61b609361c305fb8d1f1a8700e81ce139fde4..3e4ad876fa34d0e509fe6331767d31068c4ddb20 100644
+index 646ea844ed2cf674569937653f9920e4fdbf62a0..81b26444a7be0b20e83f32ec2ba3648e4997af45 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -872,4 +872,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -893,4 +893,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
          throw new IllegalArgumentException(entityCategory + " is an unrecognized entity category");
      }
      // Paper end
diff --git a/patches/server/0101-LivingEntity-broadcastItemBreak.patch b/patches/server/0101-LivingEntity-broadcastItemBreak.patch
index 23f637bdf..fb44e724f 100644
--- a/patches/server/0101-LivingEntity-broadcastItemBreak.patch
+++ b/patches/server/0101-LivingEntity-broadcastItemBreak.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] LivingEntity#broadcastItemBreak
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 00c56b7c2d2d34029144ef953aedd085183a5928..e0acfc315f80d9a5c5aa045845ccc3e00c4435c5 100644
+index 81b26444a7be0b20e83f32ec2ba3648e4997af45..6234d72de5b6c4c3dd3f65cc53c99c63ab2f251d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -883,5 +883,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -904,5 +904,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
      public void setSafeFallDistance(float safeFallDistance) {
          getHandle().safeFallDistance = safeFallDistance;
      }
diff --git a/patches/server/0205-API-for-any-mob-to-burn-daylight.patch b/patches/server/0205-API-for-any-mob-to-burn-daylight.patch
index 070259729..7d0d414d4 100644
--- a/patches/server/0205-API-for-any-mob-to-burn-daylight.patch
+++ b/patches/server/0205-API-for-any-mob-to-burn-daylight.patch
@@ -348,10 +348,10 @@ index 2fb5c5ea01d5f1071c8e8a39e7863ed0640d3fc9..e1513023d7f9701f2c1fde816fa81767
      // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 624f06c50c1e8c938ddc7b4b0ee63d723b0be89b..78154669fa940888de5cf60b7067f9fb34c3a98e 100644
+index 6234d72de5b6c4c3dd3f65cc53c99c63ab2f251d..6c258c7eadce0f0c2a4af5bef9527bf5b7d53c40 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -889,5 +889,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -910,5 +910,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
          if (slot == null) return;
          getHandle().broadcastBreakEvent(org.bukkit.craftbukkit.CraftEquipmentSlot.getNMS(slot));
      }