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,7 +5,7 @@ Subject: [PATCH] Player invulnerabilities
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index e40e8e837273c243f5ccc192514d540440f49310..64183c02cf278b20ed59120fa20fc7265321fc40 100644
index faaf63fe5afd825de34a5c4c586d106f859d0d47..9397f5ff682a344282bcea2f6273ecbdcfe8ce1e 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 {
@@ -54,7 +54,7 @@ index e40e8e837273c243f5ccc192514d540440f49310..64183c02cf278b20ed59120fa20fc726
return this;
}
}
@@ -1986,6 +1995,7 @@ public class ServerPlayer extends Player {
@@ -1992,6 +2001,7 @@ public class ServerPlayer extends Player {
}
public void sendTexturePack(String url, String hash, boolean required, @Nullable Component resourcePackPrompt) {
@@ -62,7 +62,7 @@ index e40e8e837273c243f5ccc192514d540440f49310..64183c02cf278b20ed59120fa20fc726
this.connection.send(new ClientboundResourcePackPacket(url, hash, required, resourcePackPrompt));
}
@@ -2511,9 +2521,17 @@ public class ServerPlayer extends Player {
@@ -2517,9 +2527,17 @@ public class ServerPlayer extends Player {
@Override
public boolean isImmobile() {