Updated Upstream (Paper)

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

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Minecart settings and WASD controls
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index b1e1ea0ec16f3fc9b83b8d000024e731e48c7401..5f974fec242181729340b6c353dc6b17c3f73837 100644
index 9ce1f0bf0962eb7622d8034f325056311d8e6906..ad21ea22867b77608e245469438fef9454cd57b5 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -990,6 +990,7 @@ public class ServerPlayer extends Player {
@@ -989,6 +989,7 @@ public class ServerPlayer extends Player {
if (this.isInvulnerableTo(source)) {
return false;
} else {