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,16 +1,8 @@
From 1bbb9cf5c61f902c0c65e8cdc41ae27b6c3fc9c6 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: Thu, 23 May 2019 21:50:37 -0500
Subject: [PATCH] Barrels and enderchests 6 rows
---
.../net/minecraft/server/BlockEnderChest.java | 21 ++++++++++++++++
.../minecraft/server/InventoryEnderChest.java | 2 +-
.../minecraft/server/TileEntityBarrel.java | 5 ++--
.../java/net/pl3x/purpur/PurpurConfig.java | 25 +++++++++++++++++++
.../craftbukkit/inventory/CraftContainer.java | 4 ++-
.../craftbukkit/inventory/CraftInventory.java | 2 +-
6 files changed, 54 insertions(+), 5 deletions(-)
diff --git a/src/main/java/net/minecraft/server/BlockEnderChest.java b/src/main/java/net/minecraft/server/BlockEnderChest.java
index af2819bb8..73ab299a4 100644
@@ -157,6 +149,3 @@ index 726631348..a45100034 100644
throw new IllegalArgumentException("Invalid inventory size; expected " + getSize() + " or less");
}
--
2.26.2