Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@efd47e3 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#9188)
PaperMC/Paper@1edfefd Add option to flush region files on save (#9149)
PaperMC/Paper@9daa019 Added wither vanilla invulnerability API (#9124)
This commit is contained in:
granny
2023-05-12 22:22:02 -07:00
parent 84da84887e
commit 3325421436
79 changed files with 323 additions and 347 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 f94f50541210f5b13dca3b546d84983ba246e399..02e196377924a000d42db855c77c74c7c1220595 100644
index 272e7cc5fc33ec7148a47328d2ba9d88b11092d3..244ca77d8d50c4e30b90fc2df46bc7c291f94744 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -960,6 +960,7 @@ public class ServerPlayer extends Player {
@@ -962,6 +962,7 @@ public class ServerPlayer extends Player {
}));
Team scoreboardteambase = this.getTeam();
@@ -29,7 +29,7 @@ index f94f50541210f5b13dca3b546d84983ba246e399..02e196377924a000d42db855c77c74c7
if (scoreboardteambase.getDeathMessageVisibility() == Team.Visibility.HIDE_FOR_OTHER_TEAMS) {
this.server.getPlayerList().broadcastSystemToTeam(this, ichatbasecomponent);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index d4d58ae8dc114a26129cbe88e0025a0593ae13b9..8eddfbc2c702d877f5efbc69b9d55635e6561c55 100644
index 43c2572dc1c091703b3d2fb6bc26e685383675df..6b29c1d551d647c0ff82434a466f92c20403ea73 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -201,6 +201,18 @@ public class PurpurConfig {