Updated Upstream (Paper & Tuinity)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
0aa3cc7228 Suppress deprecation registration warnings for brigadier events (#6297)
81a7559b41 Correct handling of invalid maps (#6302)

Tuinity Changes:
5620c57206 Use Velocity compression and cipher natives (#351)
3be4fc5809 [CI-SKIP] Redirect to CI when clicking CI badge in README (#344)
This commit is contained in:
William Blake Galbreath
2021-07-31 22:50:13 -05:00
parent a2340e3381
commit ef304d16da
12 changed files with 381 additions and 49 deletions

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Flying Fall Damage API
diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
index b60e38add38ac58d01f419dcb1b07a9b79bf1cb8..e2b2ee49f9b8220c2de3f26389e78b6321c60d33 100644
index 24523dd712329f2f3abe40bb3f1801ef7946e831..ebd744b08e27d6fc6dda31ada7ad8bb1864a6982 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
@@ -183,6 +183,7 @@ public abstract class Player extends LivingEntity {
@@ -16,7 +16,7 @@ index b60e38add38ac58d01f419dcb1b07a9b79bf1cb8..e2b2ee49f9b8220c2de3f26389e78b63
// CraftBukkit start
public boolean fauxSleeping;
@@ -1728,7 +1729,7 @@ public abstract class Player extends LivingEntity {
@@ -1730,7 +1731,7 @@ public abstract class Player extends LivingEntity {
@Override
public boolean causeFallDamage(float fallDistance, float damageMultiplier, DamageSource damageSource) {