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 f48aaf5a54ddeedc4009bd0349f896644e0422c3 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, 26 Mar 2020 21:39:32 -0500
Subject: [PATCH] Configurable jockey options
---
.../net/minecraft/server/EntityDrowned.java | 17 ++++++++
.../net/minecraft/server/EntityPigZombie.java | 17 ++++++++
.../net/minecraft/server/EntityZombie.java | 31 ++++++++++----
.../minecraft/server/EntityZombieHusk.java | 17 ++++++++
.../server/EntityZombieVillager.java | 17 ++++++++
.../net/pl3x/purpur/PurpurWorldConfig.java | 42 +++++++++++++++++++
6 files changed, 134 insertions(+), 7 deletions(-)
diff --git a/src/main/java/net/minecraft/server/EntityDrowned.java b/src/main/java/net/minecraft/server/EntityDrowned.java
index e6425bdf1..455b1d922 100644
@@ -274,6 +266,3 @@ index 9de724686..3e067c832 100644
+ zombieVillagerJockeyTryExistingChickens = getBoolean("mobs.zombie_villager.jockey.try-existing-chickens", zombieVillagerJockeyTryExistingChickens);
+ }
}
--
2.26.2