Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 00:47: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@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

12
patches/server/0203-Add-compass-command.patch
View File

@@ -17,10 +17,10 @@ index 23e19bfbc41c5982a746ad0b5ba8c5834c2494a5..314ab6183e31b4bac6a40c1f8007d48e
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 86847ecde7b96d3c2faf9924467ff9098505bda3..b4544ea2a307c2b89796753e33f64ffaf893f83f 100644
index daf1339f2334729adea28d47730a124a92a70f0a..44562c3ae8d0776b8834587b1d3fb628c97a7138 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 {
@@ -278,6 +278,7 @@ public class ServerPlayer extends Player {
public boolean purpurClient = false; // Purpur
public boolean acceptingResourcePack = false; // Purpur
private boolean tpsBar = false; // Purpur
@@ -28,7 +28,7 @@ index 86847ecde7b96d3c2faf9924467ff9098505bda3..b4544ea2a307c2b89796753e33f64ffa
public ServerPlayer(MinecraftServer server, ServerLevel world, GameProfile profile) {
super(world, world.getSharedSpawnPos(), world.getSharedSpawnAngle(), profile);
@@ -517,6 +518,7 @@ public class ServerPlayer extends Player {
@@ -518,6 +519,7 @@ public class ServerPlayer extends Player {
}
if (nbt.contains("Purpur.TPSBar")) { this.tpsBar = nbt.getBoolean("Purpur.TPSBar"); } // Purpur
@@ -36,7 +36,7 @@ index 86847ecde7b96d3c2faf9924467ff9098505bda3..b4544ea2a307c2b89796753e33f64ffa
}
@Override
@@ -584,6 +586,7 @@ public class ServerPlayer extends Player {
@@ -585,6 +587,7 @@ public class ServerPlayer extends Player {
this.getBukkitEntity().setExtraData(nbt); // CraftBukkit
nbt.putBoolean("Purpur.TPSBar", this.tpsBar); // Purpur
@@ -44,7 +44,7 @@ index 86847ecde7b96d3c2faf9924467ff9098505bda3..b4544ea2a307c2b89796753e33f64ffa
}
// CraftBukkit start - World fallback code, either respawn location or global spawn
@@ -2687,5 +2690,13 @@ public class ServerPlayer extends Player {
@@ -2698,5 +2701,13 @@ public class ServerPlayer extends Player {
public void tpsBar(boolean tpsBar) {
this.tpsBar = tpsBar;
}
@@ -89,7 +89,7 @@ index 31f5d9bcc11dc78b0d04c55560d5a2fa18bf3896..42532975d8c5558a7598e759838e75f2
hideHiddenPlayersFromEntitySelector = getBoolean("settings.command.hide-hidden-players-from-entity-selector", hideHiddenPlayersFromEntitySelector);
uptimeFormat = getString("settings.command.uptime.format", uptimeFormat);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 6b69f61d635c3803e21ffb3ffd5c0f3af0476502..e6696e1f5d4a38a6972102f1ff2b8b3f8b66d732 100644
index 3d0da6275827a2f0cb1aea72dac5412df8c6eb62..db1fa62541589981a45ef9be382b87ed5995e5cf 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -224,6 +224,7 @@ public class PurpurWorldConfig {