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 13ff42eb6bcfe97f9bcda34e85a1c46476430aac 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, 13 Mar 2020 22:29:10 -0500
Subject: [PATCH] Add /ping command
---
.../net/minecraft/server/ArgumentEntity.java | 2 +
.../minecraft/server/CommandDispatcher.java | 5 ++-
.../server/CommandListenerWrapper.java | 1 +
.../java/net/pl3x/purpur/PurpurConfig.java | 2 +
.../net/pl3x/purpur/command/PingCommand.java | 37 +++++++++++++++++++
5 files changed, 46 insertions(+), 1 deletion(-)
create mode 100644 src/main/java/net/pl3x/purpur/command/PingCommand.java
diff --git a/src/main/java/net/minecraft/server/ArgumentEntity.java b/src/main/java/net/minecraft/server/ArgumentEntity.java
index 1194f91a5..9141976d1 100644
@@ -134,6 +126,3 @@ index 000000000..f36e655cb
+ return targets.size();
+ }
+}
--
2.26.2