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@397349e Adventure 4.9.1 (#6634)
PaperMC/Paper@d0a2193 Fix interaction pos in range check (#6654)
PaperMC/Paper@6de48db Fix player death kept items not being in same slot (#6663)
PaperMC/Paper@3e3cea1 Ensure valid vehicle status (#6673)
This commit is contained in:
granny
2021-09-28 18:57:18 -07:00
parent acb8a26d9a
commit fd158ac23a
24 changed files with 75 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0234-Add-compass-command.patch
View File

@@ -17,7 +17,7 @@ index 48a70900082c6c2c99c955a6ac40b48859a74979..8c2424b0917d278bb0b9e687d116d8de
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 b599607d616f9faf209f1a4491dd3fcfd49a6126..0cb58f2a5607664193adddbfd7e43384c5a44862 100644
index a961987c01a59e6f37c79bac6ecbe94e62fc8721..8f421cc6838455ffdc54614e7020cb510bc4c182 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -261,6 +261,7 @@ public class ServerPlayer extends Player {
@@ -44,7 +44,7 @@ index b599607d616f9faf209f1a4491dd3fcfd49a6126..0cb58f2a5607664193adddbfd7e43384
}
// CraftBukkit start - World fallback code, either respawn location or global spawn
@@ -2562,5 +2565,13 @@ public class ServerPlayer extends Player {
@@ -2561,5 +2564,13 @@ public class ServerPlayer extends Player {
public void tpsBar(boolean tpsBar) {
this.tpsBar = tpsBar;
}
@@ -81,7 +81,7 @@ index 9d541c9e53f3f8db871f01f8d083e4cfc0de0de1..046bf9cbf02b002e89f7d39b616dd0f5
CompoundTag compoundTag = stack.getOrCreateTag();
if (compoundTag.contains("LodestoneTracked") && !compoundTag.getBoolean("LodestoneTracked")) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 6f992bd9b1e35dbd712d64daa0e0b8d5b4f85ec5..babd56746ea83c7387f17a7c191d1b878c8b5d12 100644
index 1c27d959bb4caeb6af331f4e240d9ef10454b475..15963a7d4d721f3a8b665c1917cd5f2860814a62 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -252,6 +252,11 @@ public class PurpurConfig {
@@ -111,7 +111,7 @@ index 6f992bd9b1e35dbd712d64daa0e0b8d5b4f85ec5..babd56746ea83c7387f17a7c191d1b87
hideHiddenPlayersFromEntitySelector = getBoolean("settings.command.hide-hidden-players-from-entity-selector", hideHiddenPlayersFromEntitySelector);
uptimeFormat = getString("settings.command.uptime.format", uptimeFormat);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index ec9a56a4acf191e24c10af815216cdba5afd220c..a8a8821a7a79ea5b429ca1b7e8b56a10b8869e02 100644
index 4086b6b30b78caa62f370f616213556e04a8e1fc..bed9d3397aea378274c4d9aa427d07bd8671325c 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -176,6 +176,7 @@ public class PurpurWorldConfig {