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

10
patches/server/0286-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 ef56e8e8496443c85474bfc98a71518f0515b763..15a6e8d23d8f626d7d5587f97c6ec5b10ab9afa8 100644
index 9081d891ddb61df628009232efdb31d66d5f71b6..4200ee9d24ef91af2d400783ad111584097c00da 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -276,6 +276,7 @@ public class ServerPlayer extends Player {
@@ -277,6 +277,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 ef56e8e8496443c85474bfc98a71518f0515b763..15a6e8d23d8f626d7d5587f97c6ec5b1
private boolean tpsBar = false; // Purpur
private boolean compassBar = false; // Purpur
@@ -517,6 +518,7 @@ public class ServerPlayer extends Player {
@@ -518,6 +519,7 @@ public class ServerPlayer extends Player {
}
}
@@ -37,7 +37,7 @@ index ef56e8e8496443c85474bfc98a71518f0515b763..15a6e8d23d8f626d7d5587f97c6ec5b1
if (nbt.contains("Purpur.TPSBar")) { this.tpsBar = nbt.getBoolean("Purpur.TPSBar"); } // Purpur
if (nbt.contains("Purpur.CompassBar")) { this.compassBar = nbt.getBoolean("Purpur.CompassBar"); } // Purpur
}
@@ -585,6 +587,7 @@ public class ServerPlayer extends Player {
@@ -586,6 +588,7 @@ public class ServerPlayer extends Player {
}
this.getBukkitEntity().setExtraData(nbt); // CraftBukkit
@@ -45,7 +45,7 @@ index ef56e8e8496443c85474bfc98a71518f0515b763..15a6e8d23d8f626d7d5587f97c6ec5b1
nbt.putBoolean("Purpur.TPSBar", this.tpsBar); // Purpur
nbt.putBoolean("Purpur.CompassBar", this.compassBar); // Purpur
}
@@ -2684,6 +2687,14 @@ public class ServerPlayer extends Player {
@@ -2695,6 +2698,14 @@ public class ServerPlayer extends Player {
}
}