Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +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@805423c Add ARMOR tag to MaterialTags (1.19) (#7987)
PaperMC/Paper@4a48ed3 Add option for strict advancement dimension checks (#7954)
PaperMC/Paper@17c1c6c Add missing important BlockStateListPopulator methods (#7952)
This commit is contained in:
BillyGalbreath
2022-06-15 12:40:47 -05:00
parent 92b2fd2a0c
commit 00603687b3
9 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,7 +17,7 @@ index 2fbb65c685ac88c77d54f27a5981a132fb44e370..d0ca327337206a64609c1b6ee652cf99
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 3927087d5cea154c2e8dba370fea47bdba65d05d..a90ec8363a41033db421d42896e7203e8616dd90 100644
index 8960cd89201758e325fb23bd15583af5bec39d7b..aace490037331f3ab59f2d13f6eecb3cf5ddfe80 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 {
@@ -44,7 +44,7 @@ index 3927087d5cea154c2e8dba370fea47bdba65d05d..a90ec8363a41033db421d42896e7203e
}
// CraftBukkit start - World fallback code, either respawn location or global spawn
@@ -2625,5 +2628,13 @@ public class ServerPlayer extends Player {
@@ -2631,5 +2634,13 @@ public class ServerPlayer extends Player {
public void tpsBar(boolean tpsBar) {
this.tpsBar = tpsBar;
}
@@ -59,7 +59,7 @@ index 3927087d5cea154c2e8dba370fea47bdba65d05d..a90ec8363a41033db421d42896e7203e
// Purpur end
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index 021d2ba371303bc5de0d0b30dfc5332de39d179f..6c158fefeef4634d41816fe00c721cefaf7d7455 100644
index ead823c2efe352d7c62daa491dd8c148c5dc9ab2..5c1da692d6ba145e5c9d08c17f69dbd4661a9ddb 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -263,6 +263,11 @@ public class PurpurConfig {
@@ -89,7 +89,7 @@ index 021d2ba371303bc5de0d0b30dfc5332de39d179f..6c158fefeef4634d41816fe00c721cef
hideHiddenPlayersFromEntitySelector = getBoolean("settings.command.hide-hidden-players-from-entity-selector", hideHiddenPlayersFromEntitySelector);
uptimeFormat = getString("settings.command.uptime.format", uptimeFormat);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 4cc629ee614c4ff43181af6992786c4eac190f5a..26d9943ada0bec112c5fc1ccc67d1af2a5308001 100644
index 0b1c5a91568c2e7667dc04665ee89436d0fb92ad..837ea79e092ad00749ce6a5bead3a2a3bd42618f 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -217,6 +217,7 @@ public class PurpurWorldConfig {