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@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

6
patches/server/0127-Implement-TPSBar.patch
View File

@@ -41,7 +41,7 @@ index 23454b660c123f4309d1b6eaab8f626f2663f2ef..3f7b8e62bb79d8618f962af4ea5dbec9
}
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index fe2d7acece87d5b825f3f3668c11c0efc877439b..c65eeec4ee990a1efaf5648ca31f8bb4a178ce2b 100644
index 3beced793b745ad309192d5687591d23acf46719..1de4f239dfb63250b7143e89e97487d048b99776 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -262,6 +262,7 @@ public class ServerPlayer extends Player {
@@ -68,7 +68,7 @@ index fe2d7acece87d5b825f3f3668c11c0efc877439b..c65eeec4ee990a1efaf5648ca31f8bb4
}
// CraftBukkit start - World fallback code, either respawn location or global spawn
@@ -2612,5 +2615,13 @@ public class ServerPlayer extends Player {
@@ -2618,5 +2621,13 @@ public class ServerPlayer extends Player {
this.server.getPlayerList().respawn(this, toLevel, true, to, !toLevel.paperConfig().environment.disableTeleportationSuffocationCheck);
}
}
@@ -104,7 +104,7 @@ index dea412353ba3e997d8024cb0770b9ac7300b63a1..7b3ad3316243d0d8fd2106a0f0475e1b
entityplayer.awardStat(Stats.LEAVE_GAME);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index c55504d376f331b01d53aad6a9492ce2f8a4bbd3..47f4c08c354c2d683dd0959c22c68eb78920a5da 100644
index 65e8b5569ff12fc2a49b601b5f970dfd8b223f62..68ae78e98df34849e0a3c97d27b26d0f45cf4bb7 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -176,6 +176,7 @@ public class PurpurConfig {