Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 18:37: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@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
Download Patch File Download Diff File Expand all files Collapse all files

12
patches/server/0285-Implement-ram-and-rambar-commands.patch
View File

@@ -18,10 +18,10 @@ index 6b05907bfec377e72a8858534d001bda10a1c88a..08bed4f01a27162902aa63bb8d35a915
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 ac63f8d93048a0e61f1e27abb4cc5e2b5cc5208e..be8bb3f48971e76a3637b9da0706281f352c318b 100644
index 15ec63fab5468bbfbfeefdf5475305fdf64b2b33..116cd0204177c313a4e15765340da2c97913bd77 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -277,6 +277,7 @@ public class ServerPlayer extends Player {
@@ -279,6 +279,7 @@ public class ServerPlayer extends Player {
public org.bukkit.event.player.PlayerQuitEvent.QuitReason quitReason = null; // Paper - there are a lot of changes to do if we change all methods leading to the event
public boolean purpurClient = false; // Purpur
public boolean acceptingResourcePack = false; // Purpur
@@ -29,7 +29,7 @@ index ac63f8d93048a0e61f1e27abb4cc5e2b5cc5208e..be8bb3f48971e76a3637b9da0706281f
private boolean tpsBar = false; // Purpur
private boolean compassBar = false; // Purpur
@@ -518,6 +519,7 @@ public class ServerPlayer extends Player {
@@ -520,6 +521,7 @@ public class ServerPlayer extends Player {
}
}
@@ -37,7 +37,7 @@ index ac63f8d93048a0e61f1e27abb4cc5e2b5cc5208e..be8bb3f48971e76a3637b9da0706281f
if (nbt.contains("Purpur.TPSBar")) { this.tpsBar = nbt.getBoolean("Purpur.TPSBar"); } // Purpur
if (nbt.contains("Purpur.CompassBar")) { this.compassBar = nbt.getBoolean("Purpur.CompassBar"); } // Purpur
}
@@ -586,6 +588,7 @@ public class ServerPlayer extends Player {
@@ -588,6 +590,7 @@ public class ServerPlayer extends Player {
}
this.getBukkitEntity().setExtraData(nbt); // CraftBukkit
@@ -45,7 +45,7 @@ index ac63f8d93048a0e61f1e27abb4cc5e2b5cc5208e..be8bb3f48971e76a3637b9da0706281f
nbt.putBoolean("Purpur.TPSBar", this.tpsBar); // Purpur
nbt.putBoolean("Purpur.CompassBar", this.compassBar); // Purpur
}
@@ -2695,6 +2698,14 @@ public class ServerPlayer extends Player {
@@ -2708,6 +2711,14 @@ public class ServerPlayer extends Player {
}
}
@@ -61,7 +61,7 @@ index ac63f8d93048a0e61f1e27abb4cc5e2b5cc5208e..be8bb3f48971e76a3637b9da0706281f
return this.tpsBar;
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index 2de8d543def43b39007c672f783539ca7671e7cb..ebfd0b9c713df5074ac47b2cb94cee356b4e3f4b 100644
index 3bfa8021a7da677fd15d3f2827b271fe17f514a1..82cf79cffbc961dc1db43a4afc6eb1efb5bfe297 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -181,6 +181,8 @@ public class PurpurConfig {