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,14 +1,8 @@
From 0105b33898fbefac968bac777201e745d11bdb73 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, 5 Jun 2020 23:32:38 -0500
Subject: [PATCH] Default permissions
---
.../util/permissions/CommandPermissions.java | 1 +
.../util/permissions/DefaultPermissions.java | 2 +
.../util/permissions/PurpurPermissions.java | 69 +++++++++++++++++++
3 files changed, 72 insertions(+)
create mode 100644 src/main/java/org/bukkit/util/permissions/PurpurPermissions.java
diff --git a/src/main/java/org/bukkit/util/permissions/CommandPermissions.java b/src/main/java/org/bukkit/util/permissions/CommandPermissions.java
index 7763d610..d5a42707 100644
@@ -110,6 +104,3 @@ index 00000000..14cb78e3
+ return purpur;
+ }
+}
--
2.26.2