Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 10:27:44 +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@d5f1ffc Remove somewhat broken patch
This commit is contained in:
BillyGalbreath
2022-12-19 11:11:49 -06:00
parent e2365fa207
commit 4a580c4122
39 changed files with 181 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0292-Implement-ram-and-rambar-commands.patch
View File

@@ -18,10 +18,10 @@ index a6996259f9fcb2d6520ca45fa42b11c42824ef9d..1a6f3c602437eaedbc96f1d47d08ff3a
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 5e495c427abaae7476149c19a2131d5804aecab2..7f2a811505c2aeaad6e1a91a0719613a6694f77a 100644
index 48b09b1fe0d316277a46cab700d790a1d35d3fc4..d62bf95fb067c2e2a4fc9b2757c636bd4ee75bea 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -272,6 +272,7 @@ public class ServerPlayer extends Player {
@@ -270,6 +270,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 5e495c427abaae7476149c19a2131d5804aecab2..7f2a811505c2aeaad6e1a91a0719613a
private boolean tpsBar = false; // Purpur
private boolean compassBar = false; // Purpur
@@ -513,6 +514,7 @@ public class ServerPlayer extends Player {
@@ -511,6 +512,7 @@ public class ServerPlayer extends Player {
}
}
@@ -37,7 +37,7 @@ index 5e495c427abaae7476149c19a2131d5804aecab2..7f2a811505c2aeaad6e1a91a0719613a
if (nbt.contains("Purpur.TPSBar")) { this.tpsBar = nbt.getBoolean("Purpur.TPSBar"); } // Purpur
if (nbt.contains("Purpur.CompassBar")) { this.compassBar = nbt.getBoolean("Purpur.CompassBar"); } // Purpur
}
@@ -581,6 +583,7 @@ public class ServerPlayer extends Player {
@@ -579,6 +581,7 @@ public class ServerPlayer extends Player {
}
this.getBukkitEntity().setExtraData(nbt); // CraftBukkit
@@ -45,7 +45,7 @@ index 5e495c427abaae7476149c19a2131d5804aecab2..7f2a811505c2aeaad6e1a91a0719613a
nbt.putBoolean("Purpur.TPSBar", this.tpsBar); // Purpur
nbt.putBoolean("Purpur.CompassBar", this.compassBar); // Purpur
}
@@ -2694,6 +2697,14 @@ public class ServerPlayer extends Player {
@@ -2692,6 +2695,14 @@ public class ServerPlayer extends Player {
}
}