From c296ceed7a85b574f703b6e7ba77b1143fd8a72c Mon Sep 17 00:00:00 2001
From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com>
Date: Mon, 22 Jul 2024 00:22:25 +0000
Subject: [PATCH] Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@3a47518 Deprecate more Timings things for removal (#11126)
PaperMC/Paper@aa36ae6 Fix EntityUnleashEvent cancellation on distance cause (#11131)
---
 gradle.properties                               | 2 +-
 patches/api/0004-Make-timings-calls-final.patch | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 55630c1..fdc17c4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group=org.galemc.gale
 version=1.21-R0.1-SNAPSHOT
 
 mcVersion=1.21
-paperRef=7e91a2c3abb438a3ac55b5abfc894486ed5f397f
+paperRef=aa36ae65764f652a16517a994e8d9cf4a89136c8
 
 org.gradle.caching=false
 org.gradle.parallel=true
diff --git a/patches/api/0004-Make-timings-calls-final.patch b/patches/api/0004-Make-timings-calls-final.patch
index 8738517..a3dfd47 100644
--- a/patches/api/0004-Make-timings-calls-final.patch
+++ b/patches/api/0004-Make-timings-calls-final.patch
@@ -7,10 +7,10 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 Gale - https://galemc.org
 
 diff --git a/src/main/java/co/aikar/timings/FullServerTickHandler.java b/src/main/java/co/aikar/timings/FullServerTickHandler.java
-index 36b8fe86335df851f9c85d6bb2a91368b4d945d1..16040016d7de911eddec278ec2adc2b856df9bcd 100644
+index 3e747abde6fefae90f1c15cb00158bc5303cbe50..fd9c06853a503aa787c4d93801714024465a7ee2 100644
 --- a/src/main/java/co/aikar/timings/FullServerTickHandler.java
 +++ b/src/main/java/co/aikar/timings/FullServerTickHandler.java
-@@ -19,8 +19,7 @@ public class FullServerTickHandler extends TimingHandler {
+@@ -22,8 +22,7 @@ public class FullServerTickHandler extends TimingHandler {
      }
  
      @NotNull
@@ -20,7 +20,7 @@ index 36b8fe86335df851f9c85d6bb2a91368b4d945d1..16040016d7de911eddec278ec2adc2b8
          if (TimingsManager.needsFullReset) {
              TimingsManager.resetTimings();
          } else if (TimingsManager.needsRecheckEnabled) {
-@@ -29,8 +28,7 @@ public class FullServerTickHandler extends TimingHandler {
+@@ -32,8 +31,7 @@ public class FullServerTickHandler extends TimingHandler {
          return super.startTiming();
      }