Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@1cda66e Hotfix Entity isInRain reobf issue
PaperMC/Paper@61768e0 [ci skip] Remove no longer needed mappings change
PaperMC/Paper@e035fd7 Updated Upstream (Bukkit/CraftBukkit/Spigot)
PaperMC/Paper@c215ce1 [ci skip] cleanup patch diff from last commit
This commit is contained in:
granny
2023-12-25 18:45:01 -08:00
parent 6aec125590
commit 10685bb957
24 changed files with 75 additions and 75 deletions

View File

@@ -18,7 +18,7 @@ index c1202a56b560269e132eafd8bb12383473d4d33e..815af29d1aae935264a400bdb9c3d676
if (environment.includeIntegrated) {
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index adbce4f4334c8857f0ab2fec910ba3883582256b..07c6e9c5a32ef7155525924d1a0e433943787819 100644
index b44dbc0b989658c82aa68e83b094e295dc4e5fe5..8e36b261a4f8ea82bab778d3abd3326aa347d19a 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -284,6 +284,7 @@ public class ServerPlayer extends Player {
@@ -45,7 +45,7 @@ index adbce4f4334c8857f0ab2fec910ba3883582256b..07c6e9c5a32ef7155525924d1a0e4339
nbt.putBoolean("Purpur.TPSBar", this.tpsBar); // Purpur
nbt.putBoolean("Purpur.CompassBar", this.compassBar); // Purpur
}
@@ -2913,5 +2916,13 @@ public class ServerPlayer extends Player {
@@ -2914,5 +2917,13 @@ public class ServerPlayer extends Player {
public void compassBar(boolean compassBar) {
this.compassBar = compassBar;
}
@@ -60,7 +60,7 @@ index adbce4f4334c8857f0ab2fec910ba3883582256b..07c6e9c5a32ef7155525924d1a0e4339
// Purpur end
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index ed9b2f0b55229848894d9d6b401d050cb031b893..568bb53e91dda4804cd328a81ba12ce735c52603 100644
index 40922e69274de6bc3da6f74b0216a816a1fb7722..128eab7246bf263e302cbeb5e4c359a41dd2cd3f 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -182,6 +182,8 @@ public class PurpurConfig {