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@31699ae Updated Upstream (Bukkit/CraftBukkit) (#10242)
This commit is contained in:
granny
2024-02-11 21:56:58 -08:00
parent 425889dc45
commit 70a76c42bf
77 changed files with 356 additions and 375 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0194-Player-ridable-in-water-option.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Player ridable in water option
diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
index 4db05f2de856c5ea023ee8ce4a6052257cc32549..d9b12e2b4e5d3039bde74a847a484c0dae319a92 100644
index 0fba4859f63c272a1256d3d6cde23609cd165708..d0204938816f3e74b0845b9a62f4b6ad44d2dd02 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
@@ -2041,6 +2041,11 @@ public abstract class Player extends LivingEntity {
@@ -2042,6 +2042,11 @@ public abstract class Player extends LivingEntity {
return this.inventory.armor;
}
@@ -21,7 +21,7 @@ index 4db05f2de856c5ea023ee8ce4a6052257cc32549..d9b12e2b4e5d3039bde74a847a484c0d
if (!this.isPassenger() && this.onGround() && !this.isInWater() && !this.isInPowderSnow) {
if (this.getShoulderEntityLeft().isEmpty()) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 34360b9ed30b20159a6174ef5fc64c415b661f53..14164ef2a4204886c279897b89aca6e071005870 100644
index fc209fcd02343dba4e7d22f341cb9a0e88db9ae9..470bf7896527a23cb7888fdf9d502183f4487f68 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -394,6 +394,7 @@ public class PurpurWorldConfig {