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 2e6244aec6bbbb3846c4ba2c59998c44e605ace9 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: Sun, 19 Apr 2020 00:25:09 -0500
Subject: [PATCH] Anvil API
---
.../event/inventory/AnvilTakeResultEvent.java | 52 +++++++++++++++++++
.../inventory/AnvilUpdateResultEvent.java | 35 +++++++++++++
.../org/bukkit/inventory/AnvilInventory.java | 10 ++++
3 files changed, 97 insertions(+)
create mode 100644 src/main/java/net/pl3x/purpur/event/inventory/AnvilTakeResultEvent.java
create mode 100644 src/main/java/net/pl3x/purpur/event/inventory/AnvilUpdateResultEvent.java
diff --git a/src/main/java/net/pl3x/purpur/event/inventory/AnvilTakeResultEvent.java b/src/main/java/net/pl3x/purpur/event/inventory/AnvilTakeResultEvent.java
new file mode 100644
@@ -129,6 +122,3 @@ index b95e563b..435026e5 100644
+ void setDoUnsafeEnchants(boolean canDoUnsafeEnchants);
+ // Purpur end
}
--
2.26.2