From 61b63b10e50b5759a50de5f606dd9ef0db4ece8b Mon Sep 17 00:00:00 2001
From: granny <granny@purpurmc.org>
Date: Sun, 21 Jul 2024 03:45:43 -0700
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/0035-Remove-Timings.patch | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index d086189f5..02ae513e3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
 version = 1.21-R0.1-SNAPSHOT
 
 mcVersion = 1.21
-paperCommit = 7e91a2c3abb438a3ac55b5abfc894486ed5f397f
+paperCommit = aa36ae65764f652a16517a994e8d9cf4a89136c8
 
 org.gradle.caching = true
 org.gradle.parallel = true
diff --git a/patches/api/0035-Remove-Timings.patch b/patches/api/0035-Remove-Timings.patch
index debc2fc1b..a48ee240c 100644
--- a/patches/api/0035-Remove-Timings.patch
+++ b/patches/api/0035-Remove-Timings.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Remove Timings
 
 
 diff --git a/src/main/java/co/aikar/timings/TimedEventExecutor.java b/src/main/java/co/aikar/timings/TimedEventExecutor.java
-index 8f29c1561ba5916cb5634392edd8bd2a5a294a51..6fbc64e0f214d0c8e5afcbe385e414a4e1fe1c72 100644
+index 157617933a772451f6c073d97afaf305769b4d40..438a9c76381ea3f5b774e2232ff56c5dc6f82586 100644
 --- a/src/main/java/co/aikar/timings/TimedEventExecutor.java
 +++ b/src/main/java/co/aikar/timings/TimedEventExecutor.java
-@@ -77,9 +77,9 @@ public class TimedEventExecutor implements EventExecutor {
+@@ -80,9 +80,9 @@ public class TimedEventExecutor implements EventExecutor {
              executor.execute(listener, event);
              return;
          }
@@ -21,7 +21,7 @@ index 8f29c1561ba5916cb5634392edd8bd2a5a294a51..6fbc64e0f214d0c8e5afcbe385e414a4
  
      @Override
 diff --git a/src/main/java/co/aikar/timings/Timing.java b/src/main/java/co/aikar/timings/Timing.java
-index 7514fad26f955329f8bf17ff17db75f0c8301ee5..1d866e980abc542bdfee1ce082cd9cdd7761e9f7 100644
+index 4195efcfe044618052bb03dea34a4fb2ca7c44f0..8709c955bac34bc546a8e022cfac808bc61ee793 100644
 --- a/src/main/java/co/aikar/timings/Timing.java
 +++ b/src/main/java/co/aikar/timings/Timing.java
 @@ -39,6 +39,7 @@ public interface Timing extends AutoCloseable {
@@ -71,7 +71,7 @@ index 7514fad26f955329f8bf17ff17db75f0c8301ee5..1d866e980abc542bdfee1ce082cd9cdd
      void close();
  }
 diff --git a/src/main/java/co/aikar/timings/Timings.java b/src/main/java/co/aikar/timings/Timings.java
-index 9812d668ad945aba486fbf6d5bf83c4292cb5d03..752d54830aa8baa1450bf72da03ae55ed30293c2 100644
+index e81d0bc309de877ed2b5da6122f55c162e9b5f10..3d663104c8e3089abdb9dc4d7309f873ac182e98 100644
 --- a/src/main/java/co/aikar/timings/Timings.java
 +++ b/src/main/java/co/aikar/timings/Timings.java
 @@ -124,7 +124,7 @@ public final class Timings {
@@ -99,10 +99,10 @@ index 9812d668ad945aba486fbf6d5bf83c4292cb5d03..752d54830aa8baa1450bf72da03ae55e
  
      private static void warnAboutDeprecationOnEnable() {
 diff --git a/src/main/java/co/aikar/timings/TimingsCommand.java b/src/main/java/co/aikar/timings/TimingsCommand.java
-index e801e79fa57c44b2e5d359647c920f88064826f1..1abfcee0f6d632f4cd8d74b4994a90c9ea9d254c 100644
+index 95d87c9dbf2b237787294dfbe7fed87a36e6dedf..b831a23999c94cb1bdf7f5d2cd719d0b846242ad 100644
 --- a/src/main/java/co/aikar/timings/TimingsCommand.java
 +++ b/src/main/java/co/aikar/timings/TimingsCommand.java
-@@ -45,7 +45,7 @@ public class TimingsCommand extends BukkitCommand {
+@@ -47,7 +47,7 @@ public class TimingsCommand extends BukkitCommand {
      public TimingsCommand(@NotNull String name) {
          super(name);
          this.description = "Manages Spigot Timings data to see performance of the server.";
@@ -111,7 +111,7 @@ index e801e79fa57c44b2e5d359647c920f88064826f1..1abfcee0f6d632f4cd8d74b4994a90c9
          this.setPermission("bukkit.command.timings");
      }
  
-@@ -54,8 +54,12 @@ public class TimingsCommand extends BukkitCommand {
+@@ -56,8 +56,12 @@ public class TimingsCommand extends BukkitCommand {
          if (!testPermission(sender)) {
              return true;
          }
@@ -126,7 +126,7 @@ index e801e79fa57c44b2e5d359647c920f88064826f1..1abfcee0f6d632f4cd8d74b4994a90c9
          }
          if (args.length < 1) {
              sender.sendMessage(text("Usage: " + this.usageMessage, NamedTextColor.RED));
-@@ -115,7 +119,7 @@ public class TimingsCommand extends BukkitCommand {
+@@ -117,7 +121,7 @@ public class TimingsCommand extends BukkitCommand {
          Preconditions.checkNotNull(args, "Arguments cannot be null");
          Preconditions.checkNotNull(alias, "Alias cannot be null");