Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@d8d59e0 Fix NPE sending resource pack without prompt
PaperMC/Paper@5a9afbe Fixes issues in the suppress dismount cancellation patch (#10735)
PaperMC/Paper@0ad09de Make PaperSimplePluginClassLoader show class which is not found
This commit is contained in:
granny
2024-05-19 15:11:01 -07:00
parent 9dcfdf13c2
commit 88aa731cf3
14 changed files with 55 additions and 55 deletions

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Add option to set armorstand step height
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index e49dda27dd609ebf377f679c4f60c13a5f610c8e..429d1a3fd7a75fe3dc8eb8d467ad4f2bd99e0212 100644
index e90c753e8a2d1ca75ee55ff250b16d60b1d61df6..f1cecf8ba15c6e6827b572386e82992bdecaef08 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -340,6 +340,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -16,7 +16,7 @@ index e49dda27dd609ebf377f679c4f60c13a5f610c8e..429d1a3fd7a75fe3dc8eb8d467ad4f2b
public boolean noPhysics;
public final RandomSource random;
public int tickCount;
@@ -4852,7 +4853,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -4858,7 +4859,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
}
public float maxUpStep() {
@@ -26,7 +26,7 @@ index e49dda27dd609ebf377f679c4f60c13a5f610c8e..429d1a3fd7a75fe3dc8eb8d467ad4f2b
public void onExplosionHit(@Nullable Entity entity) {}
diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
index c2bd2e303f956d390319f6bbbe9a6492ebec5154..5abbc0caf90cafc1a06dfff158c158b1538f827c 100644
index a02ca704e98ef42f32c3c50b111ee3537f60bf7b..ebf1d6e3431e36811f14ed09d3b891a074fbdaf2 100644
--- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
+++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
@@ -676,6 +676,7 @@ public class ArmorStand extends LivingEntity {