Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-04-20 18:28:15 +02: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@a7ae966 readd itemstack data sanitization (#10454)
PaperMC/Paper@ca50b87 Clear firework item properly (#10793)
PaperMC/Paper@9774a52 fix and cleanup loot table patches (#10100)
PaperMC/Paper@ac4ee06 Fix integer overflow for lag compensating eating check (#10797)
PaperMC/Paper@6649a17 Fix BlockStateMeta equals (#10795)
PaperMC/Paper@1b8cdc6 Extend Player Interact cancellation to cover Jigsaw blocks (#10719)
PaperMC/Paper@841ab41 Fix more item desync when an event is cancelled (#10654)
PaperMC/Paper@b0e3ca4 Prevent NPE if hooked entity was cleared (#10712)
PaperMC/Paper@347bbe3 Fix Cancelling BlockPlaceEvent calling onRemove (#10773)
This commit is contained in:
granny
2024-05-26 17:12:40 -07:00
parent 22fc5f9bda
commit 2842b97ddf
38 changed files with 160 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0190-Add-compass-command.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Add compass command
diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
index f11d6bb515217088ef1192653998a77ddce67edf..9a91a29614823e10f59aeaa156d85f7229bfb497 100644
index 2afedee0f62f71bc5cdd7e54d73dd5bb84072a18..157a8cd3599a196f1c12f56ad4c5aa68898a1960 100644
--- a/src/main/java/net/minecraft/commands/Commands.java
+++ b/src/main/java/net/minecraft/commands/Commands.java
@@ -257,6 +257,7 @@ public class Commands {
@@ -17,7 +17,7 @@ index f11d6bb515217088ef1192653998a77ddce67edf..9a91a29614823e10f59aeaa156d85f72
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 58b066793a6248b4627f6b81921412971828e313..cce4ebb350ba09323c59903991e4f6f289d2cb53 100644
index 00572e66b50d9e6489871f629e45c36b0ca47715..03a1eceaed065b7f33d830414136ed3c07c2034c 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -300,6 +300,7 @@ public class ServerPlayer extends Player {
@@ -28,7 +28,7 @@ index 58b066793a6248b4627f6b81921412971828e313..cce4ebb350ba09323c59903991e4f6f2
// Paper start - replace player chunk loader
private final java.util.concurrent.atomic.AtomicReference<io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances> viewDistances = new java.util.concurrent.atomic.AtomicReference<>(new io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances(-1, -1, -1));
@@ -611,6 +612,7 @@ public class ServerPlayer extends Player {
@@ -612,6 +613,7 @@ public class ServerPlayer extends Player {
}
if (nbt.contains("Purpur.TPSBar")) { this.tpsBar = nbt.getBoolean("Purpur.TPSBar"); } // Purpur
@@ -36,7 +36,7 @@ index 58b066793a6248b4627f6b81921412971828e313..cce4ebb350ba09323c59903991e4f6f2
}
@Override
@@ -688,6 +690,7 @@ public class ServerPlayer extends Player {
@@ -689,6 +691,7 @@ public class ServerPlayer extends Player {
}
nbt.putBoolean("Purpur.TPSBar", this.tpsBar); // Purpur
@@ -44,7 +44,7 @@ index 58b066793a6248b4627f6b81921412971828e313..cce4ebb350ba09323c59903991e4f6f2
}
// CraftBukkit start - World fallback code, either respawn location or global spawn
@@ -3017,5 +3020,13 @@ public class ServerPlayer extends Player {
@@ -3018,5 +3021,13 @@ public class ServerPlayer extends Player {
public void tpsBar(boolean tpsBar) {
this.tpsBar = tpsBar;
}