Updated Upstream (Paper)

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

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Config to ignore nearby mobs when sleeping
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 4980b0b46e75a4bc914cb3719d8b394fbcd8c224..c74e15d4776d98f288454eb609a798a183e51ee8 100644
index bc5d5a2a48cfc6b4257d1cc3ac73d8ec5300721d..c217c773d014e1bda00ac14e90824d5bb636ecc4 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1335,7 +1335,7 @@ public class ServerPlayer extends Player {
@@ -1341,7 +1341,7 @@ public class ServerPlayer extends Player {
return entitymonster.isPreventingPlayerRest(this);
});
@@ -18,7 +18,7 @@ index 4980b0b46e75a4bc914cb3719d8b394fbcd8c224..c74e15d4776d98f288454eb609a798a1
}
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 57450c6f3da1289b15ecc821614018506c60601f..bfe0bf2572a48fee700bbbb2aa756ab61827b960 100644
index d10ec237ccebcfb72502c5f3b84f2a4ecac07ee8..f244f917b35b80f0801fecf08753da63a99443f0 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -348,6 +348,7 @@ public class PurpurWorldConfig {