update upstream

gommehdnet · Jul 31, 2024 · 4345e6b · 4345e6b
1 parent 5b5a7fd
commit 4345e6b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -2,7 +2,7 @@ group=net.gommehd.cheetah
 version=1.21-R0.1-SNAPSHOT
 
 mcVersion=1.21
-paperRef=5a5035be964f3350b06264a31d8add2fa9d2994f
+paperRef=0a1be9ae87416ffca38cf20412e248c78a9d6a3c
 
 org.gradle.caching=true
 org.gradle.parallel=true

diff --git a/patches/server/0004-added-ProjectileAllowCollideWithPlayerEvent.patch b/patches/server/0004-added-ProjectileAllowCollideWithPlayerEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] added ProjectileAllowCollideWithPlayerEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-index 5f7d152f41eb85f17bcded4bc8099b998e5a338b..2c23e2b942467d156086b410c1eaf8ecd3786930 100644
+index a01c0d9ae53d1b748c5da914069bd672cb1215c7..8e3038d63b978523ae78f0530d23413b7ebff4c5 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-@@ -310,7 +310,10 @@ public abstract class Projectile extends Entity implements TraceableEntity {
+@@ -316,7 +316,10 @@ public abstract class Projectile extends Entity implements TraceableEntity {
              if (entity1 instanceof net.minecraft.server.level.ServerPlayer && entity instanceof net.minecraft.server.level.ServerPlayer) {
                  org.bukkit.entity.Player collided = (org.bukkit.entity.Player) entity.getBukkitEntity();
                  org.bukkit.entity.Player shooter = (org.bukkit.entity.Player) entity1.getBukkitEntity();

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,13 +5,13 @@ 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 d20969e18984c9b93483477f31b079686977b1db..96ba568fd92ba7e5ece6571e4662a75a1b81e232 100644
+index 214ea75502d4abf9ebbc99a3811e4d2f8465227e..465dae03643af07e8c87758aad95ecc9b0bb9fa0 100644
 --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-@@ -343,6 +343,7 @@ public class GlobalConfiguration extends ConfigurationPart {
-         public boolean useDimensionTypeForCustomSpawners = false;
-         public boolean strictAdvancementDimensionCheck = false;
+@@ -346,6 +346,7 @@ public class GlobalConfiguration extends ConfigurationPart {
          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;
 +        public boolean enableElytraInEndCities = true; // Cheetah - Added option to disable elytra in end cities
      }