Updated Upstream (Paper)

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

View File

@@ -17,10 +17,10 @@ index 25b832fe30c3837d02b10017e58ad0fa9d097092..3919d9c193abcfd8b97dfb0ceb386384
// Paper end
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 64dc052f41e0ef96753e0ffd3d6517fc93dc5185..86847ecde7b96d3c2faf9924467ff9098505bda3 100644
index 8e537c5b3926b6196f6cfd36cead4cb75ea9534a..daf1339f2334729adea28d47730a124a92a70f0a 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -959,6 +959,7 @@ public class ServerPlayer extends Player {
@@ -960,6 +960,7 @@ public class ServerPlayer extends Player {
}));
Team scoreboardteambase = this.getTeam();