Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@6178609 Fix tripwire state inconsistency
PaperMC/Paper@ae6fec6 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#7116)
PaperMC/Paper@5cb2942 Update paperweight to 1.3.3 and shadow to 7.1.1
PaperMC/Paper@8a9979c Update gradle wrapper to 7.3.2
PaperMC/Paper@df8d28a Update checker framework & log4j-api for paper-api (also rebuild patches)
This commit is contained in:
Encode42
2021-12-21 14:42:52 -05:00
parent a1c3bf0eb1
commit d0431d6c9c
45 changed files with 81 additions and 224 deletions

View File

@@ -26,10 +26,10 @@ index 4252ff0201cbfbecc7b95ca86c1763dc5d88a4d7..535bc6d57d153a62f2cbf57747586de3
} else {
if (fallDistance >= 2.0F) {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index e92c9815ce3f41760e4a31b01ce90d0818657521..9879a38526648652d3c8362d7166bd0217385043 100644
index 6691abc34043b39460eccd98311c9d8efbefa8a0..2622cf83dd501b982fdd20b31d174bb0d63d1218 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2628,5 +2628,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2645,5 +2645,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void setSpawnInvulnerableTicks(int spawnInvulnerableTime) {
getHandle().spawnInvulnerableTime = spawnInvulnerableTime;
}