From cb01343c947d3c216f09b1884a2a9dc646d0fadb Mon Sep 17 00:00:00 2001
From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com>
Date: Wed, 10 Jul 2024 01:19:31 +0300
Subject: [PATCH] Updated Upstream (Purpur)

Upstream has released updates that appear to apply and compile correctly

Purpur Changes:
PurpurMC/Purpur@ff19bcc Updated Upstream (Paper)
---
 gradle.properties                                           | 2 +-
 .../api/0008-Add-Higher-Java-Version-for-Pufferfish.patch   | 0
 .../0052-Add-Higher-Java-Version-for-Pufferfish-SIMD.patch  | 0
 patches/server/0009-Fix-MC-172801.patch                     | 4 ++--
 ...thium-entity.fast_elytra_check-entity.fast_hand_sw.patch | 6 +++---
 5 files changed, 6 insertions(+), 6 deletions(-)
 rename patches/{unapplied => removed/1.21}/api/0008-Add-Higher-Java-Version-for-Pufferfish.patch (100%)
 rename patches/{unapplied => removed/1.21}/server/0052-Add-Higher-Java-Version-for-Pufferfish-SIMD.patch (100%)

diff --git a/gradle.properties b/gradle.properties
index ab75b5b..41df4f8 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group = space.bxteam.divinemc
 
 mcVersion = 1.21
 version = 1.21-R0.1-SNAPSHOT
-purpurRef = cb0f04bd77350ec0bdf4bc03a68fcca7211c5682
+purpurRef = ff19bccd8c59870090ec5de4906844a59d651986
 
 org.gradle.caching = true
 org.gradle.parallel = true
diff --git a/patches/unapplied/api/0008-Add-Higher-Java-Version-for-Pufferfish.patch b/patches/removed/1.21/api/0008-Add-Higher-Java-Version-for-Pufferfish.patch
similarity index 100%
rename from patches/unapplied/api/0008-Add-Higher-Java-Version-for-Pufferfish.patch
rename to patches/removed/1.21/api/0008-Add-Higher-Java-Version-for-Pufferfish.patch
diff --git a/patches/unapplied/server/0052-Add-Higher-Java-Version-for-Pufferfish-SIMD.patch b/patches/removed/1.21/server/0052-Add-Higher-Java-Version-for-Pufferfish-SIMD.patch
similarity index 100%
rename from patches/unapplied/server/0052-Add-Higher-Java-Version-for-Pufferfish-SIMD.patch
rename to patches/removed/1.21/server/0052-Add-Higher-Java-Version-for-Pufferfish-SIMD.patch
diff --git a/patches/server/0009-Fix-MC-172801.patch b/patches/server/0009-Fix-MC-172801.patch
index 6f2a90b..08ce742 100644
--- a/patches/server/0009-Fix-MC-172801.patch
+++ b/patches/server/0009-Fix-MC-172801.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Fix MC-172801
 Original post on Mojira: https://bugs.mojang.com/browse/MC-172801
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index cf01a2ef9d72edc7661661c13a85c777bf32b83b..77edee5e7bd9ef9be77dd5f48c57488934fae598 100644
+index b06797b805ba52adb3f7619e8768a627911cffa0..00ad560e06d21dcb1415c00976d9957ac00a18c2 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3164,7 +3164,13 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3163,7 +3163,13 @@ public abstract class LivingEntity extends Entity implements Attackable {
      }
  
      protected float getFlyingSpeed() {
diff --git a/patches/server/0020-lithium-entity.fast_elytra_check-entity.fast_hand_sw.patch b/patches/server/0020-lithium-entity.fast_elytra_check-entity.fast_hand_sw.patch
index fd1d52f..266ea0c 100644
--- a/patches/server/0020-lithium-entity.fast_elytra_check-entity.fast_hand_sw.patch
+++ b/patches/server/0020-lithium-entity.fast_elytra_check-entity.fast_hand_sw.patch
@@ -7,10 +7,10 @@ Original code by CaffeineMC, licensed under LGPL v3
 You can find the original code on https://github.com/CaffeineMC/lithium-fabric (Yarn mappings)
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 77edee5e7bd9ef9be77dd5f48c57488934fae598..c07f4de6808d05dc65ac51e17b0c21d94707378a 100644
+index 00ad560e06d21dcb1415c00976d9957ac00a18c2..b99866f8d4737ebc5d419d69486ad88a6dcd510f 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -2681,6 +2681,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -2680,6 +2680,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
      }
  
      protected void updateSwingTime() {
@@ -18,7 +18,7 @@ index 77edee5e7bd9ef9be77dd5f48c57488934fae598..c07f4de6808d05dc65ac51e17b0c21d9
          int i = this.getCurrentSwingDuration();
  
          if (this.swinging) {
-@@ -3681,6 +3682,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3680,6 +3681,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
      }
  
      private void updateFallFlying() {