Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@4d20922 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#11024) PaperMC/Paper@2fa5e0e Fix horse inventories (#11028) PaperMC/Paper@62ed302 Fix entity distance check when applying knockback PaperMC/Paper@70b0e84 Properly apply damage tick after absorption (#11043) PaperMC/Paper@b0ef3ca Only call EntityDamageEvents before actuallyHurt (#11045)
pufferfish-gg · Jul 9, 2024 · eaa18d5 · eaa18d5
1 parent 68f859c
commit eaa18d5
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -7,4 +7,4 @@ org.gradle.jvmargs="-Xmx4G"
 group=gg.pufferfish.pufferfish
 version=1.21-R0.1-SNAPSHOT
 mcVersion=1.21
-paperRef=8d91b859cbeb64ecbc3916249fce26a085b320aa
+paperRef=b0ef3ca25ab162c7eefda819b7a24574e5c44e6c
diff --git a/patches/server/0001-Pufferfish-branding.patch b/patches/server/0001-Pufferfish-branding.patch
@@ -209,10 +209,10 @@ index 0000000000000000000000000000000000000000..41aa14445457abe7bdd3880e8667e465
 +}
 \ No newline at end of file
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index d70c5546c8bd6f364fad9b24880b6867efdab644..01e9e297708d437f5acda534d5c2313ba0c6eef8 100644
+index 3137391cadef7c67019561e65fedd0664e689eae..994153f714a05138a085ced5f04e6ee288a8230e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -504,7 +504,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -498,7 +498,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
 
      @Override
      public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {

diff --git a/patches/server/0008-Optimize-suffocation.patch b/patches/server/0008-Optimize-suffocation.patch
@@ -35,7 +35,7 @@ index c84ef666a896dc0d154610e1e6360ca5def739fd..a047bcbb9aa47d094f3daeed6708b191
 +	
  }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index b9cef93fe382b666bec04ca95eeaf2d8acbb3c40..6935d10a9f159c09fef95817b2b5e120f3e1939d 100644
+index 909accac7538e1c0c0c51deb2ee0605697c059d0..d5671ec71d6e68654371470ae44e109457fcdf3e 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -449,7 +449,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -47,7 +47,7 @@ index b9cef93fe382b666bec04ca95eeaf2d8acbb3c40..6935d10a9f159c09fef95817b2b5e120
                      this.hurt(this.damageSources().inWall(), 1.0F);
                  } else if (flag && !this.level().getWorldBorder().isWithinBounds(this.getBoundingBox())) {
                      double d0 = this.level().getWorldBorder().getDistanceToBorder(this) + this.level().getWorldBorder().getDamageSafeZone();
-@@ -1408,6 +1408,19 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1409,6 +1409,19 @@ public abstract class LivingEntity extends Entity implements Attackable {
          return this.getHealth() <= 0.0F;
      }
 

diff --git a/patches/server/0022-Cache-climbing-check-for-activation.patch b/patches/server/0022-Cache-climbing-check-for-activation.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Cache climbing check for activation
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 6935d10a9f159c09fef95817b2b5e120f3e1939d..542ca05018dc500de90ba62a1c8722eaa263d106 100644
+index d5671ec71d6e68654371470ae44e109457fcdf3e..8569c433c291a15182577c48b4d486eaddb047af 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -157,7 +157,6 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@@ -16,7 +16,7 @@ index 6935d10a9f159c09fef95817b2b5e120f3e1939d..542ca05018dc500de90ba62a1c8722ea
 
  public abstract class LivingEntity extends Entity implements Attackable {
 
-@@ -2046,6 +2045,20 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -2078,6 +2077,20 @@ public abstract class LivingEntity extends Entity implements Attackable {
          return this.lastClimbablePos;
      }