Updated Upstream (Paper & Tuinity)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
fcbeac8a [CI-SKIP] Readme update (#3702)
824f8086 Bandaid italic legacy serialization #3757 (#3760)

Tuinity Changes:
9f21359: Re-add optimise collision checking in player move packet handling
1152054: Revert player move packet optimisation
ef0a6c4: Optimise collision checking in player move packets
This commit is contained in:
William Blake Galbreath
2020-07-02 20:37:57 -05:00
parent 140a58f451
commit 5c7cdad371
127 changed files with 178 additions and 1200 deletions

View File

@@ -1,14 +1,8 @@
From 2ae8c1ce21cbcd4061616fbe7cbd2ff5550437b1 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 5 May 2019 12:58:45 -0500
Subject: [PATCH] LivingEntity safeFallDistance
---
.../java/net/minecraft/server/EntityGiantZombie.java | 1 +
.../net/minecraft/server/EntityHorseAbstract.java | 2 +-
src/main/java/net/minecraft/server/EntityLiving.java | 7 ++++---
.../bukkit/craftbukkit/entity/CraftLivingEntity.java | 12 ++++++++++++
4 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/src/main/java/net/minecraft/server/EntityGiantZombie.java b/src/main/java/net/minecraft/server/EntityGiantZombie.java
index 603fe5caa..37618126f 100644
@@ -88,6 +82,3 @@ index 3777aba5f..2a82a2bb7 100644
+ }
+ // Purpur end
}
--
2.26.2