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,11 +1,8 @@
From b9d3e5804fc24259bf59943ac14de4a3416a4856 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 02:35:24 -0500
Subject: [PATCH] SkeletonHorseTrapEvent#getPlayer
---
.../event/entity/SkeletonHorseTrapEvent.java | 24 +++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java
index d79dbcd6..1ed3ea8f 100644
@@ -63,6 +60,3 @@ index d79dbcd6..1ed3ea8f 100644
@Override
public boolean isCancelled() {
return cancelled;
--
2.26.2