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,15 +1,8 @@
From 187dbb6bb7a7a564c79b2db678c2fd5d9f32d964 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: Fri, 31 May 2019 21:24:21 -0500
Subject: [PATCH] Advancement API
---
.../org/bukkit/advancement/Advancement.java | 9 ++++
.../advancement/AdvancementDisplay.java | 53 +++++++++++++++++++
.../org/bukkit/advancement/FrameType.java | 27 ++++++++++
3 files changed, 89 insertions(+)
create mode 100644 src/main/java/org/bukkit/advancement/AdvancementDisplay.java
create mode 100644 src/main/java/org/bukkit/advancement/FrameType.java
diff --git a/src/main/java/org/bukkit/advancement/Advancement.java b/src/main/java/org/bukkit/advancement/Advancement.java
index 7c500997..432caadb 100644
@@ -128,6 +121,3 @@ index 00000000..d1757f3d
+ return "FrameType[name=" + name() + ",color=" + color + "]";
+ }
+}
--
2.26.2