update upstream

gommehdnet · Jan 12, 2025 · 574e335 · 574e335
1 parent be8f158
commit 574e335
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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/...patches/files/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java.patch b/...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 @@
+@@ -349,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/...per-patches/files/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java.patch b/...per-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
@@ -1,7 +1,7 @@
 group=net.gommehd.cheetah
 version=1.21.4-R0.1-SNAPSHOT
 mcVersion=1.21.4
-paperRef=49d15f6345b59b2085ded0a634336d3406d62fdc
+paperRef=ed75b0e54b38ff71b73ffea2ae66e1e9f01af407
 
 org.gradle.configuration-cache=true
 org.gradle.caching=true