diff --git a/gradle.properties b/gradle.properties
index c2e2428..d2c275b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group=me.samsuik.sakura
 version=1.20.6-R0.1-SNAPSHOT
 
 mcVersion=1.20.6
-paperRef=bd5867a96f792f0eb32c1d249bb4bbc1d8338d14
+paperRef=79e2cb620ef03539390d97940824b38b707918f5
 
 org.gradle.jvmargs=-Xmx2G
 
diff --git a/patches/api/0001-Customise-Version-Command.patch b/patches/api/0001-Customise-Version-Command.patch
index a7a5f90..c865e6a 100644
--- a/patches/api/0001-Customise-Version-Command.patch
+++ b/patches/api/0001-Customise-Version-Command.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Customise Version Command
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 9a219b255b63f10005fc68faacb771dd32f61ac2..63f8ca44f6066294cb1f996bfb89b0ce8b1e0afb 100644
+index 47039514503d99e84cb99f4941707a7726286516..3e426dc442fd7c82cfd89c4c46290f0c857eddf9 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -124,6 +124,20 @@ public final class Bukkit {
@@ -30,10 +30,10 @@ index 9a219b255b63f10005fc68faacb771dd32f61ac2..63f8ca44f6066294cb1f996bfb89b0ce
       * Gets the name of this server implementation.
       *
 diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
-index fd5d9881abfd930bb883120f018f76dc78b62b14..5fdafa08fb8932333cacd1a6ddb701e96f89bec2 100644
+index e64bb57f74e6d6f78927be228825b3e0bdf41f48..019b8abbf69ea0f741e725ae1c965f04604fe16d 100644
 --- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java
 +++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
-@@ -32,6 +32,11 @@ import net.kyori.adventure.text.event.ClickEvent;
+@@ -33,6 +33,11 @@ import net.kyori.adventure.text.event.ClickEvent;
  import net.kyori.adventure.text.format.TextDecoration;
  import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
  // Paper end - version command 2.0
@@ -45,7 +45,7 @@ index fd5d9881abfd930bb883120f018f76dc78b62b14..5fdafa08fb8932333cacd1a6ddb701e9
  
  public class VersionCommand extends BukkitCommand {
      private VersionFetcher versionFetcher; // Paper - version command 2.0
-@@ -43,6 +48,15 @@ public class VersionCommand extends BukkitCommand {
+@@ -44,6 +49,15 @@ public class VersionCommand extends BukkitCommand {
          return versionFetcher;
      }
  
@@ -61,7 +61,7 @@ index fd5d9881abfd930bb883120f018f76dc78b62b14..5fdafa08fb8932333cacd1a6ddb701e9
      public VersionCommand(@NotNull String name) {
          super(name);
  
-@@ -54,12 +68,18 @@ public class VersionCommand extends BukkitCommand {
+@@ -55,12 +69,18 @@ public class VersionCommand extends BukkitCommand {
  
      @Override
      public boolean execute(@NotNull CommandSender sender, @NotNull String currentAlias, @NotNull String[] args) {
diff --git a/patches/server/0003-Sakura-Configuration-Files.patch b/patches/server/0003-Sakura-Configuration-Files.patch
index 943857f..3649127 100644
--- a/patches/server/0003-Sakura-Configuration-Files.patch
+++ b/patches/server/0003-Sakura-Configuration-Files.patch
@@ -1039,7 +1039,7 @@ index 0000000000000000000000000000000000000000..4024f9738e039ffffd560a07a2210f75
 +public record DurableMaterial(int durability, float resistance) {
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 0ed42fa899721f83b598db05be1b5f321af3614a..48648f73925c79282df19158ef52678d10608f44 100644
+index 3751c2a077bd13bac330b93c6efc2a640a17f4f2..420e375f7dac5c001278c0cb15a98aa39d609aec 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -310,6 +310,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1062,7 +1062,7 @@ index 0ed42fa899721f83b598db05be1b5f321af3614a..48648f73925c79282df19158ef52678d
  
      private void readScoreboard(DimensionDataStorage persistentStateManager) {
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 2eb9c584cc77237f1c82d880a51a3f8b51008d73..fbbd168198459d9d4d84c2554558453c63b2c2f4 100644
+index ad967cc2283f902c76e48a59d59cf0dbdacbb5e3..fef543e614ef7394ab70ad05d3158bc81a8bbdf5 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -233,6 +233,11 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -1120,10 +1120,10 @@ index 14281a4e72f49dc4eb2ca3da8479c1f81a3a175d..f2cd3046fdd280b03586e645216ccef1
          this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 94a31c8f903eb61eb6d203e8e6fe8fb0beca28b1..33dbc9b263578525c9a7f7a7fd85214a96623032 100644
+index 5db08432b6afd3639688830e717f40ceaf599248..4ea6a5af351d5bf40154571a2e8d6af26a1bcb58 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1033,6 +1033,7 @@ public final class CraftServer implements Server {
+@@ -1056,6 +1056,7 @@ public final class CraftServer implements Server {
  
          org.spigotmc.SpigotConfig.init((File) this.console.options.valueOf("spigot-settings")); // Spigot
          this.console.paperConfigurations.reloadConfigs(this.console);
@@ -1131,7 +1131,7 @@ index 94a31c8f903eb61eb6d203e8e6fe8fb0beca28b1..33dbc9b263578525c9a7f7a7fd85214a
          for (ServerLevel world : this.console.getAllLevels()) {
              // world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
              world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters, config.spawnAnimals); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
-@@ -1064,6 +1065,7 @@ public final class CraftServer implements Server {
+@@ -1087,6 +1088,7 @@ public final class CraftServer implements Server {
          this.reloadData();
          org.spigotmc.SpigotConfig.registerCommands(); // Spigot
          io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper
@@ -1140,7 +1140,7 @@ index 94a31c8f903eb61eb6d203e8e6fe8fb0beca28b1..33dbc9b263578525c9a7f7a7fd85214a
          this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index e02102280ed1dc300191d19bbca8f00e17701753..a4637ca09b4054fde4fbef25d502d5e98cbfe4b5 100644
+index b86ba59158964f73abd6622341a9acb98a33fa44..163be3f86f3fabce0e6f10b83ac6db07596dac5d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -176,6 +176,14 @@ public class Main {
diff --git a/patches/server/0028-Optimise-LivingEntity-pushEntities.patch b/patches/server/0028-Optimise-LivingEntity-pushEntities.patch
index c5e8afb..8399b2b 100644
--- a/patches/server/0028-Optimise-LivingEntity-pushEntities.patch
+++ b/patches/server/0028-Optimise-LivingEntity-pushEntities.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Optimise LivingEntity#pushEntities
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index ce01fe82dc1eaaf06ca317ddbc62b7d1b87a48b2..ba612c35d74be6b31495c17dbb8cf13ef28b526b 100644
+index 21e61bb75ac7ce468bc757633ce678b21bcb9deb..a7bbd4d1ddb7e80724cdd05a6d6b37161e711264 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3560,7 +3560,11 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3554,7 +3554,11 @@ public abstract class LivingEntity extends Entity implements Attackable {
                  return;
              }
              // Paper end - don't run getEntities if we're not going to use its result
diff --git a/patches/server/0030-Configure-Entity-Knockback.patch b/patches/server/0030-Configure-Entity-Knockback.patch
index ad1926c..4751b44 100644
--- a/patches/server/0030-Configure-Entity-Knockback.patch
+++ b/patches/server/0030-Configure-Entity-Knockback.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Configure Entity Knockback
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index ba612c35d74be6b31495c17dbb8cf13ef28b526b..be9484d75e5c42ce784f7654e2db7b8848e124f6 100644
+index a7bbd4d1ddb7e80724cdd05a6d6b37161e711264..72e32af2d329a4f27f91932fec0d3a92fae414fb 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -1568,7 +1568,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1562,7 +1562,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
                          d0 = (Math.random() - Math.random()) * 0.01D;
                      }
  
@@ -17,7 +17,7 @@ index ba612c35d74be6b31495c17dbb8cf13ef28b526b..be9484d75e5c42ce784f7654e2db7b88
                      if (!flag) {
                          this.indicateDamage(d0, d1);
                      }
-@@ -1622,7 +1622,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1616,7 +1616,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
      }
  
      protected void blockedByShield(LivingEntity target) {
@@ -26,7 +26,7 @@ index ba612c35d74be6b31495c17dbb8cf13ef28b526b..be9484d75e5c42ce784f7654e2db7b88
      }
  
      private boolean checkTotemDeathProtection(DamageSource source) {
-@@ -1940,14 +1940,26 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1934,14 +1934,26 @@ public abstract class LivingEntity extends Entity implements Attackable {
      }
  
      public void knockback(double d0, double d1, double d2, @Nullable Entity attacker, io.papermc.paper.event.entity.EntityKnockbackEvent.Cause cause) { // Paper - knockback events
diff --git a/patches/server/0040-Option-to-configure-entity-water-sensitivity.patch b/patches/server/0040-Option-to-configure-entity-water-sensitivity.patch
index 53fd487..ae8fc8d 100644
--- a/patches/server/0040-Option-to-configure-entity-water-sensitivity.patch
+++ b/patches/server/0040-Option-to-configure-entity-water-sensitivity.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Option to configure entity water sensitivity
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index be9484d75e5c42ce784f7654e2db7b8848e124f6..cd38d1a5ac545aa3ef33f6cb54301d6f9a301bc3 100644
+index 72e32af2d329a4f27f91932fec0d3a92fae414fb..2fb84d928884050c63cfa598d45dda39a7c2cec4 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3509,7 +3509,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3503,7 +3503,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
              }
          }
          // Paper end - Add EntityMoveEvent
diff --git a/patches/server/0053-Add-instant-mob-death-animation.patch b/patches/server/0053-Add-instant-mob-death-animation.patch
index 81502ff..6aa765f 100644
--- a/patches/server/0053-Add-instant-mob-death-animation.patch
+++ b/patches/server/0053-Add-instant-mob-death-animation.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add instant mob death animation
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 1b11b7196517018c1fb4d9b77704a86feb3440b5..dea684367869ac4302b0d77540074b5e5cad7db5 100644
+index 2fb84d928884050c63cfa598d45dda39a7c2cec4..c0a0a8808003d7e56c4de4f4ad1c494b15cc41a2 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -1802,6 +1802,12 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1796,6 +1796,12 @@ public abstract class LivingEntity extends Entity implements Attackable {
  
              // Paper start
              if (this.dead) { // Paper
diff --git a/patches/server/0070-Legacy-player-combat-mechanics.patch b/patches/server/0070-Legacy-player-combat-mechanics.patch
index a203417..b06aa18 100644
--- a/patches/server/0070-Legacy-player-combat-mechanics.patch
+++ b/patches/server/0070-Legacy-player-combat-mechanics.patch
@@ -50,7 +50,7 @@ index 0000000000000000000000000000000000000000..b1c55ef758f61914e6df9b2c8096bce6
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 911a72456f90d9ba49fb10443a2c59d35f292d72..ed1cd8624df04419031bb55c03d31d8c002dfbc7 100644
+index c0a0a8808003d7e56c4de4f4ad1c494b15cc41a2..ec501831c187b6d3aaa9396325289d080647fb12 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -287,6 +287,72 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -126,7 +126,7 @@ index 911a72456f90d9ba49fb10443a2c59d35f292d72..ed1cd8624df04419031bb55c03d31d8c
  
      protected LivingEntity(EntityType<? extends LivingEntity> type, Level world) {
          super(type, world);
-@@ -2187,7 +2253,16 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -2181,7 +2247,16 @@ public abstract class LivingEntity extends Entity implements Attackable {
      protected float getDamageAfterArmorAbsorb(DamageSource source, float amount) {
          if (!source.is(DamageTypeTags.BYPASSES_ARMOR)) {
              // this.hurtArmor(damagesource, f); // CraftBukkit - Moved into actuallyHurt(DamageSource, float)
@@ -143,7 +143,7 @@ index 911a72456f90d9ba49fb10443a2c59d35f292d72..ed1cd8624df04419031bb55c03d31d8c
          }
  
          return amount;
-@@ -3283,6 +3358,12 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3277,6 +3352,12 @@ public abstract class LivingEntity extends Entity implements Attackable {
  
                      });
                  }
diff --git a/patches/server/0072-Change-shields-to-reduce-damage.patch b/patches/server/0072-Change-shields-to-reduce-damage.patch
index 239122b..0f75d09 100644
--- a/patches/server/0072-Change-shields-to-reduce-damage.patch
+++ b/patches/server/0072-Change-shields-to-reduce-damage.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Change shields to reduce damage
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index ed1cd8624df04419031bb55c03d31d8c002dfbc7..c9f23149df9bb0a2a73abb6e16ff9673562d60eb 100644
+index ec501831c187b6d3aaa9396325289d080647fb12..5727ab8a124a31a53e92ab2ed3ab58416b539688 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -2329,7 +2329,13 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -2323,7 +2323,13 @@ public abstract class LivingEntity extends Entity implements Attackable {
              Function<Double, Double> blocking = new Function<Double, Double>() {
                  @Override
                  public Double apply(Double f) {
diff --git a/patches/server/0073-Old-enchanted-golden-apples.patch b/patches/server/0073-Old-enchanted-golden-apples.patch
index 5011ad8..b0d331d 100644
--- a/patches/server/0073-Old-enchanted-golden-apples.patch
+++ b/patches/server/0073-Old-enchanted-golden-apples.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Old enchanted golden apples
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index c9f23149df9bb0a2a73abb6e16ff9673562d60eb..f917b484f73ed44a6ad7be6aa049e18a13520594 100644
+index 5727ab8a124a31a53e92ab2ed3ab58416b539688..308812738ff4fe3f20778fc516a841bd8da2dd28 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -4487,6 +4487,11 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -4481,6 +4481,11 @@ public abstract class LivingEntity extends Entity implements Attackable {
  
      public ItemStack eat(Level world, ItemStack stack) {
          FoodProperties foodinfo = (FoodProperties) stack.get(DataComponents.FOOD);