Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@b89e6a0 Readd more patches
PaperMC/Paper@be8ac7a Fix respawn error due to null location
PaperMC/Paper@8d91b85 Prioritize vanilla commands in function parsing (#11011)
This commit is contained in:
granny
2024-07-04 21:48:11 -07:00
parent 8b987b1110
commit de2e7a7967
37 changed files with 173 additions and 190 deletions

View File

@@ -5,10 +5,10 @@ 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 9803b348fdcb8a6250277afc8de260777993ac8e..746390a7ccf87476b07f125469ff80f1dd8777c6 100644
index d2831ea1480607af84beb7ff7796975d876712a5..4014acb8f83a68c7d3938fdc7a3f002b606ddc1f 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -343,6 +343,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -344,6 +344,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
public double xOld;
public double yOld;
public double zOld;
@@ -16,7 +16,7 @@ index 9803b348fdcb8a6250277afc8de260777993ac8e..746390a7ccf87476b07f125469ff80f1
public boolean noPhysics;
public final RandomSource random;
public int tickCount;
@@ -4657,7 +4658,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -4658,7 +4659,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
}
public float maxUpStep() {