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,17 +1,8 @@
From f9e2498834beb19689a969fb82358791dead4355 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:33 -0500
Subject: [PATCH] Advancement API
---
.../net/minecraft/server/Advancement.java | 2 +-
.../minecraft/server/AdvancementDisplay.java | 12 ++++-
.../server/AdvancementFrameType.java | 15 +++++-
.../minecraft/server/CriterionTrigger.java | 1 +
.../advancement/CraftAdvancement.java | 7 +++
.../advancement/CraftAdvancementDisplay.java | 47 +++++++++++++++++++
6 files changed, 79 insertions(+), 5 deletions(-)
create mode 100644 src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementDisplay.java
diff --git a/src/main/java/net/minecraft/server/Advancement.java b/src/main/java/net/minecraft/server/Advancement.java
index 315a03cf5..07d4c4cfd 100644
@@ -187,6 +178,3 @@ index 000000000..1cbb1e67b
+ return handle.isHidden();
+ }
+}
--
2.26.2