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@41ab602 [ci skip] couple more fixes for build pr jar label (#8599)
PaperMC/Paper@c40f8d5 Sync offhand slot in menus (#7341)
PaperMC/Paper@425baed Fully deserialise persistent anger post async load (#8560)
PaperMC/Paper@ec6a9a3 Updated Upstream (Bukkit/CraftBukkit) (#8604)
PaperMC/Paper@96fdafd Player Entity Tracking Events (#4722)
PaperMC/Paper@407a445 Fix dumplisteners missing folder creation
PaperMC/Paper@b07d5e0 Limit pet look distance (#8612)
PaperMC/Paper@476ef25 Add missing Fluid type (#8608)
This commit is contained in:
Encode42
2022-12-07 12:05:48 -05:00
parent 86f2da583b
commit 482a83ff9f
21 changed files with 70 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,7 +5,7 @@ Subject: [PATCH] Implement ram and rambar commands
diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
index eb4dac2239592d680ef31edf47f1ab660299762d..1b956c3f50750a00eaf7851112004115e9572395 100644
index e2a90eed64717ef24b4e1c3dd0b6d90da3ac5eed..6505112d94ad7d21a71663ae6516c5196abb6531 100644
--- a/src/main/java/net/minecraft/commands/Commands.java
+++ b/src/main/java/net/minecraft/commands/Commands.java
@@ -213,6 +213,8 @@ public class Commands {
@@ -18,7 +18,7 @@ index eb4dac2239592d680ef31edf47f1ab660299762d..1b956c3f50750a00eaf7851112004115
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 72d75313d41aea81ae4c60e2539abf39e650d372..09801f15b0110503cd7487b5fd3c4b3dffb37cb8 100644
index 5cfed037cda553f4d752770890ae0c9b3f42cbfd..bd472130d94ec2a7507a585809fa99047eb60d19 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -263,6 +263,7 @@ public class ServerPlayer extends Player {
@@ -29,7 +29,7 @@ index 72d75313d41aea81ae4c60e2539abf39e650d372..09801f15b0110503cd7487b5fd3c4b3d
private boolean tpsBar = false; // Purpur
private boolean compassBar = false; // Purpur
@@ -491,6 +492,7 @@ public class ServerPlayer extends Player {
@@ -498,6 +499,7 @@ public class ServerPlayer extends Player {
}
}
@@ -37,7 +37,7 @@ index 72d75313d41aea81ae4c60e2539abf39e650d372..09801f15b0110503cd7487b5fd3c4b3d
if (nbt.contains("Purpur.TPSBar")) { this.tpsBar = nbt.getBoolean("Purpur.TPSBar"); } // Purpur
if (nbt.contains("Purpur.CompassBar")) { this.compassBar = nbt.getBoolean("Purpur.CompassBar"); } // Purpur
}
@@ -553,6 +555,7 @@ public class ServerPlayer extends Player {
@@ -560,6 +562,7 @@ public class ServerPlayer extends Player {
}
this.getBukkitEntity().setExtraData(nbt); // CraftBukkit
@@ -45,7 +45,7 @@ index 72d75313d41aea81ae4c60e2539abf39e650d372..09801f15b0110503cd7487b5fd3c4b3d
nbt.putBoolean("Purpur.TPSBar", this.tpsBar); // Purpur
nbt.putBoolean("Purpur.CompassBar", this.compassBar); // Purpur
}
@@ -2647,6 +2650,14 @@ public class ServerPlayer extends Player {
@@ -2654,6 +2657,14 @@ public class ServerPlayer extends Player {
}
}