Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
45ec379 Bump paperweight to 1.1.8
59371cb Optimize Anti-Xray (#5991)
1d194e5 [ci-skip] Fix description of add-plugin command line option (#6031)
333cc2e Don't complete skull lookups on main thread (MC-227435)
2291667 [ci skip] patch-ception
2103ad2 Fix NPE when using broadcast as players are joining
This commit is contained in:
William Blake Galbreath
2021-06-29 17:27:48 -05:00
parent cd5f184f6d
commit bb8a98a41f
5 changed files with 10 additions and 10 deletions

View File

@@ -26,10 +26,10 @@ index b9ce1021f12f14ba45c49890d8d529b733bae532..48e208c332a06c56fef604920a1cb95c
} 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 cc3750a28627a2b9def1b2cac91f43b9a0b7f2e3..563e501d658018e2503f2972df181e623592b9aa 100644
index 5e729ad8677b84be00895fb29a4e209248e3f55f..432ac0aa33e3d69a9fb640ec5ecc9edae42ea8ab 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2569,5 +2569,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2570,5 +2570,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void setSpawnInvulnerableTicks(int spawnInvulnerableTime) {
getHandle().spawnInvulnerableTime = spawnInvulnerableTime;
}