From 7e2df5b97c734b2c4e033c82e2f19730007fa2a0 Mon Sep 17 00:00:00 2001
From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com>
Date: Thu, 15 Aug 2024 00:12:42 +0000
Subject: [PATCH] Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@9ab644e Fix `TooltipContext.create` being wrong(#11254)
PaperMC/Paper@11b4ac7 Fix disableEndCredits world config (#11261)
---
 gradle.properties                                         | 2 +-
 patches/server/0011-Remove-vanilla-profiler.patch         | 8 ++++----
 ...dcast-crit-animations-as-the-entity-being-critte.patch | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index a8cf03a..47023bb 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group=org.galemc.gale
 version=1.21.1-R0.1-SNAPSHOT
 
 mcVersion=1.21.1
-paperRef=7c9240f4a63b13be1fdcedbfb0270f9b49b75518
+paperRef=11b4ac7c659ffb7e4790b0856b14117b6d532200
 
 org.gradle.caching=false
 org.gradle.parallel=true
diff --git a/patches/server/0011-Remove-vanilla-profiler.patch b/patches/server/0011-Remove-vanilla-profiler.patch
index 55ffe4b..8be7ccf 100644
--- a/patches/server/0011-Remove-vanilla-profiler.patch
+++ b/patches/server/0011-Remove-vanilla-profiler.patch
@@ -986,10 +986,10 @@ index 108a3edd8dff37c19feac1f247c57a9deae15887..7aa13de4b3778e6708ed46ddcedde100
  
                  while (iterator.hasNext()) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 5980b70e2d7273239245237189b2debcbccfbac3..e2633083327853b87a265aab93d7eba5c5f980a7 100644
+index 6c280abdef5f80b668d6090f9d35283a33e21e0c..85b24bf7dd5f98b9a2d700f1294b9306fb7979b3 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1372,7 +1372,6 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
+@@ -1371,7 +1371,6 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
                  this.unsetRemoved();
                  */
                  // CraftBukkit end
@@ -997,7 +997,7 @@ index 5980b70e2d7273239245237189b2debcbccfbac3..e2633083327853b87a265aab93d7eba5
                  if (worldserver != null && resourcekey == LevelStem.OVERWORLD && worldserver.getTypeKey() == LevelStem.NETHER) { // CraftBukkit - empty to fall through to null to event
                      this.enteredNetherPosition = this.position();
                  }
-@@ -1388,8 +1387,6 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
+@@ -1387,8 +1386,6 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
                  worldserver = ((CraftWorld) exit.getWorld()).getHandle();
                  // CraftBukkit end
  
@@ -1006,7 +1006,7 @@ index 5980b70e2d7273239245237189b2debcbccfbac3..e2633083327853b87a265aab93d7eba5
                  // CraftBukkit start
                  this.isChangingDimension = true; // CraftBukkit - Set teleport invulnerability only if player changing worlds
                  LevelData worlddata = worldserver.getLevelData();
-@@ -1406,7 +1403,6 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
+@@ -1405,7 +1402,6 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
                  this.connection.teleport(exit); // CraftBukkit - use internal teleport without event
                  this.connection.resetPosition();
                  worldserver.addDuringTeleport(this);
diff --git a/patches/server/0100-Broadcast-crit-animations-as-the-entity-being-critte.patch b/patches/server/0100-Broadcast-crit-animations-as-the-entity-being-critte.patch
index eb97c4d..0571c7b 100644
--- a/patches/server/0100-Broadcast-crit-animations-as-the-entity-being-critte.patch
+++ b/patches/server/0100-Broadcast-crit-animations-as-the-entity-being-critte.patch
@@ -13,10 +13,10 @@ As part of: MultiPaper (https://github.com/MultiPaper/MultiPaper)
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 36d009fb72351457fc238b250b097878f30db246..15d016885c46bbf7417b14142d9aca259aeb9472 100644
+index 4854f3ccb643a0f0487dbbe84dc2b7f7eeb9c627..e27d7439d48be96696082085dc0f0bbcdb056f5a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -2149,12 +2149,18 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
+@@ -2148,12 +2148,18 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
  
      @Override
      public void crit(Entity target) {