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,12 +1,8 @@
From dfb25a8ebbc77cc96c5f8b3a7efb69c887e13669 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: Sat, 19 Oct 2019 00:29:02 -0500
Subject: [PATCH] Evoker API
---
.../java/net/minecraft/server/EntityEvoker.java | 5 +++--
.../bukkit/craftbukkit/entity/CraftEvoker.java | 17 +++++++++++++++++
2 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/src/main/java/net/minecraft/server/EntityEvoker.java b/src/main/java/net/minecraft/server/EntityEvoker.java
index dd55e5e5b..c37c2930e 100644
@@ -69,6 +65,3 @@ index 0636d2647..a7a548421 100644
+ }
+ // Purpur end
}
--
2.26.2