update upstream

gommehdnet · Apr 11, 2024 · 207292f · 207292f
1 parent cf1353d
commit 207292f
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -2,7 +2,7 @@ plugins {
     java
     `maven-publish`
     id("com.github.johnrengelman.shadow") version "8.1.1" apply false
-    id("io.papermc.paperweight.patcher") version "1.5.11"
+    id("io.papermc.paperweight.patcher") version "1.5.13"
 }
 
 val paperMavenPublicUrl = "https://papermc.io/repo/repository/maven-public/"

diff --git a/gradle.properties b/gradle.properties
@@ -2,7 +2,7 @@ group=net.gommehd.cheetah
 version=1.20.4-R0.1-SNAPSHOT
 
 mcVersion=1.20.4
-paperRef=45d1486fecab6f50c193bea0fcf03727832f3091
+paperRef=5436d44bf2509ff89129f8790ee4643f09c72871
 
 org.gradle.caching=true
 org.gradle.parallel=true

diff --git a/patches/server/0001-Build-changes.patch b/patches/server/0001-Build-changes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Build changes
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 241808d8619e17c0681f79acbbc98af5bf52dd89..4f6f102055a60eba5025b7254b07bd08133579c0 100644
+index bcfe59b6efb628ee1e7f9d60667360d4d885fb6a..073b0e79b69dacd4b3687affe163ca501b474a40 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -13,8 +13,12 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
@@ -32,7 +32,7 @@ index 241808d8619e17c0681f79acbbc98af5bf52dd89..4f6f102055a60eba5025b7254b07bd08
              "Implementation-Vendor" to date, // Paper
              "Specification-Title" to "Bukkit",
              "Specification-Version" to project.version,
-@@ -155,7 +159,7 @@ fun TaskContainer.registerRunTask(
+@@ -150,7 +154,7 @@ fun TaskContainer.registerRunTask(
      name: String,
      block: JavaExec.() -> Unit
  ): TaskProvider<JavaExec> = register<JavaExec>(name) {
@@ -42,7 +42,7 @@ index 241808d8619e17c0681f79acbbc98af5bf52dd89..4f6f102055a60eba5025b7254b07bd08
      standardInput = System.`in`
      workingDir = rootProject.layout.projectDirectory
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 93b661e9cb7743aeff7da3972942cb73049a5e4c..1ff04feafe0309922ba6b4f15e0f5f6df476ff74 100644
+index c8772c773f9933ed1d1debfe707af4373c458152..e785a5d9c9b8a19877cf4430fab8d861b60b68a2 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1865,7 +1865,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa

diff --git a/patches/server/0004-added-ProjectileAllowCollideWithPlayerEvent.patch b/patches/server/0004-added-ProjectileAllowCollideWithPlayerEvent.patch
@@ -36,7 +36,7 @@ index 156809090f1f83ad68e7e2477a3cfddac5757a8e..0845ec1a08cf281506fac327b4eb104c
                  }
              }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index cb3e9672f375a1a660757a05362729ddb5ca7504..62fb314863c5bf4a6a3d9f75b535b6a9782830eb 100644
+index c0823c612de9dc2a64cc797f061eef25c5f31359..84b258b06aae8a3ea827448dbc291ea456d34a0e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -15,6 +15,8 @@ import java.util.Map;
@@ -48,7 +48,7 @@ index cb3e9672f375a1a660757a05362729ddb5ca7504..62fb314863c5bf4a6a3d9f75b535b6a9
  import net.minecraft.core.BlockPos;
  import net.minecraft.core.Direction;
  import net.minecraft.network.protocol.game.ServerboundContainerClosePacket;
-@@ -1455,7 +1457,8 @@ public class CraftEventFactory {
+@@ -1456,7 +1458,8 @@ public class CraftEventFactory {
          com.destroystokyo.paper.event.entity.ProjectileCollideEvent event = new com.destroystokyo.paper.event.entity.ProjectileCollideEvent(projectile, collided);
 
          if (projectile.getShooter() instanceof Player && collided instanceof Player) {
@@ -58,7 +58,7 @@ index cb3e9672f375a1a660757a05362729ddb5ca7504..62fb314863c5bf4a6a3d9f75b535b6a9
                  event.setCancelled(true);
                  return event;
              }
-@@ -1466,6 +1469,15 @@ public class CraftEventFactory {
+@@ -1467,6 +1470,15 @@ public class CraftEventFactory {
      }
      // Paper end
 

diff --git a/patches/server/0014-added-option-to-disable-elytra-in-end-cities.patch b/patches/server/0014-added-option-to-disable-elytra-in-end-cities.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] added option to disable elytra in end cities
 
 
 diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-index f2e30d8743a97c0541808dc5c03300c0d881b843..03ff5623d33bf31755d2c1d353b323f8764864d7 100644
+index 0cc2307636279915c1f8529e62174cc696e185ee..269881cd0916461a40f10d3607f98809f954a296 100644
 --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-@@ -334,6 +334,7 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -336,6 +336,7 @@ public class GlobalConfiguration extends ConfigurationPart {
          public boolean useDimensionTypeForCustomSpawners = false;
          public boolean strictAdvancementDimensionCheck = false;
          public IntOr.Default compressionLevel = IntOr.Default.USE_DEFAULT;