Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 02:17:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@c6aa61e Updated Upstream (Bukkit/CraftBukkit/Spigot) (#11561)
PaperMC/Paper@93b435d [ci skip] better instructions for patch apply conflict (#11568)
PaperMC/Paper@42a1901 Correctly adopt upstream item EAR fix (#11582)
PaperMC/Paper@fcb6c72 Correctly pass velocity native compressor (#11509)
This commit is contained in:
granny
2024-11-06 18:39:37 -08:00
parent e86a1b6801
commit 962ee3064d
21 changed files with 60 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0031-Add-option-to-set-armorstand-step-height.patch
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 07808cd73e800917228b3baebabdb9361f211958..a76c75e73c0bb060ad170b9d0981493dfdd28ddd 100644
index 0360d3a4e7f291e3528a0debe4909e774e8c8b91..2750f1f0d572f7c4f8b855c32bd1946c2de1bc00 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 07808cd73e800917228b3baebabdb9361f211958..a76c75e73c0bb060ad170b9d0981493d
public boolean noPhysics;
private boolean wasOnFire;
public final RandomSource random;
@@ -5145,7 +5146,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -5175,7 +5176,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
}
public float maxUpStep() {