Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +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@a622eba Fix beehives generating from using bonemeal (#9052)
PaperMC/Paper@fbf74ba Updated Upstream (CraftBukkit) (#9053)
This commit is contained in:
granny
2023-03-26 23:43:18 -07:00
parent 49d99462fa
commit 7e014a84b5
31 changed files with 99 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0008-Ridables.patch
View File

@@ -46,10 +46,10 @@ index 87d6b8e0cd8fec7959fb052dce1b73feb8cdb967..b40bc54e80dadc8eb426ed6217b87963
final Throwable thr = new Throwable(entity + " Added to world at " + new java.util.Date());
io.papermc.paper.util.StacktraceDeobfuscator.INSTANCE.deobfuscateThrowable(thr);
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 1b3a4928aba578b402e4364aa6501b5445e0669f..94408cb56dcc229ae59ab8e682c803faaecfec5c 100644
index 01e52ea23d5481c2df79d2c899b4febf3f4a8948..d59e49a4958ebfb2ce0b9ca127b5a98fc5d88804 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -707,6 +707,15 @@ public class ServerPlayer extends Player {
@@ -708,6 +708,15 @@ public class ServerPlayer extends Player {
this.trackStartFallingPosition();
this.trackEnteredOrExitedLavaOnVehicle();
this.advancements.flushDirty(this);
@@ -5079,7 +5079,7 @@ index c9fb50c33ac15fe72bc77167e4647f30942fdc5d..89ec1e52f91c2e4cd17eeaa23cab366c
this.setTradingPlayer(player);
this.openTradingScreen(player, this.getDisplayName(), 1);
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 2b02800666b358159c8ecb63208a14855f90657b..9cccd24c096caa7a78f2bafabf0760c7a9112fdb 100644
index 0629c471d38a77c44fc1c86ccdfcb0690f61ca17..ffcc81c07b5aa45d1471e05676f43e96db13b045 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
@@ -197,6 +197,19 @@ public abstract class Player extends LivingEntity {