From 2db29cc63397b4de1640a82c8755e3746b43e8be Mon Sep 17 00:00:00 2001
From: TrainmasterHD <jendrikeggerskapp@web.de>
Date: Mon, 13 Jan 2025 20:58:03 +0100
Subject: [PATCH] Update upstream (#36)

* update upstream

* update upstream

* update upstream
---
 build.gradle.kts                                              | 2 +-
 cheetah-server/build.gradle.kts.patch                         | 2 +-
 .../minecraft/world/entity/projectile/Projectile.java.patch   | 2 +-
 .../paper/configuration/GlobalConfiguration.java.patch        | 2 +-
 .../org/bukkit/craftbukkit/event/CraftEventFactory.java.patch | 4 ++--
 gradle.properties                                             | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 4767543..8f59e76 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -3,7 +3,7 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent
 
 plugins {
     java // TODO java launcher tasks
-    id("io.papermc.paperweight.patcher") version "2.0.0-beta.12"
+    id("io.papermc.paperweight.patcher") version "2.0.0-beta.13"
 }
 
 paperweight {
diff --git a/cheetah-server/build.gradle.kts.patch b/cheetah-server/build.gradle.kts.patch
index 75a41c5..cd8adb4 100644
--- a/cheetah-server/build.gradle.kts.patch
+++ b/cheetah-server/build.gradle.kts.patch
@@ -49,7 +49,7 @@
  dependencies {
 -    implementation(project(":paper-api"))
 +    implementation(project(":cheetah-api"))
-     implementation("ca.spottedleaf:concurrentutil:0.0.2")
+     implementation("ca.spottedleaf:concurrentutil:0.0.3")
      implementation("org.jline:jline-terminal-ffm:3.27.1") // use ffm on java 22+
      implementation("org.jline:jline-terminal-jni:3.27.1") // fall back to jni on java 21
 @@ -192,14 +_,14 @@
diff --git a/cheetah-server/minecraft-patches/sources/net/minecraft/world/entity/projectile/Projectile.java.patch b/cheetah-server/minecraft-patches/sources/net/minecraft/world/entity/projectile/Projectile.java.patch
index c5d247e..e0b54f6 100644
--- a/cheetah-server/minecraft-patches/sources/net/minecraft/world/entity/projectile/Projectile.java.patch
+++ b/cheetah-server/minecraft-patches/sources/net/minecraft/world/entity/projectile/Projectile.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/entity/projectile/Projectile.java
 +++ b/net/minecraft/world/entity/projectile/Projectile.java
-@@ -409,7 +_,10 @@
+@@ -412,7 +_,10 @@
              if (owner instanceof net.minecraft.server.level.ServerPlayer && target instanceof net.minecraft.server.level.ServerPlayer) {
                  org.bukkit.entity.Player collided = (org.bukkit.entity.Player) target.getBukkitEntity();
                  org.bukkit.entity.Player shooter = (org.bukkit.entity.Player) owner.getBukkitEntity();
diff --git a/cheetah-server/paper-patches/files/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java.patch b/cheetah-server/paper-patches/files/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java.patch
index 4839248..1cc517b 100644
--- a/cheetah-server/paper-patches/files/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java.patch
+++ b/cheetah-server/paper-patches/files/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java.patch
@@ -1,6 +1,6 @@
 --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-@@ -344,6 +_,7 @@
+@@ -348,6 +_,7 @@
          public IntOr.Default compressionLevel = IntOr.Default.USE_DEFAULT;
          @Comment("Defines the leniency distance added on the server to the interaction range of a player when validating interact packets.")
          public DoubleOr.Default clientInteractionLeniencyDistance = DoubleOr.Default.USE_DEFAULT;
diff --git a/cheetah-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java.patch b/cheetah-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java.patch
index b7d0ee3..00630bf 100644
--- a/cheetah-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java.patch
+++ b/cheetah-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java.patch
@@ -1,6 +1,6 @@
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1479,7 +_,10 @@
+@@ -1480,7 +_,10 @@
          com.destroystokyo.paper.event.entity.ProjectileCollideEvent event = new com.destroystokyo.paper.event.entity.ProjectileCollideEvent(projectile, collided);
  
          if (projectile.getShooter() instanceof Player && collided instanceof Player) {
@@ -12,7 +12,7 @@
                  event.setCancelled(true);
                  return event;
              }
-@@ -1489,6 +_,15 @@
+@@ -1490,6 +_,15 @@
          return event;
      }
      // Paper end
diff --git a/gradle.properties b/gradle.properties
index 62e6678..368275c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,7 @@
 group=net.gommehd.cheetah
 version=1.21.4-R0.1-SNAPSHOT
 mcVersion=1.21.4
-paperRef=49d15f6345b59b2085ded0a634336d3406d62fdc
+paperRef=1bb3677651770f274404b2a245c9b51cb82b776a
 
 org.gradle.configuration-cache=true
 org.gradle.caching=true