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 28836c3c83dabf35398ee624855ceed85b0da776 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 Dec 2019 18:52:55 -0600
Subject: [PATCH] Cat spawning options
---
.../net/minecraft/server/IEntityAccess.java | 1 +
.../net/minecraft/server/MobSpawnerCat.java | 24 ++++++++++++-------
.../net/minecraft/server/VillagePlace.java | 1 +
.../minecraft/server/VillagePlaceType.java | 3 ++-
.../net/minecraft/server/WorldServer.java | 1 +
.../net/pl3x/purpur/PurpurWorldConfig.java | 9 +++++++
6 files changed, 30 insertions(+), 9 deletions(-)
diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java
index dfa8f3439..a3a073f9d 100644
@@ -138,6 +130,3 @@ index b41d4959c..55e609cc1 100644
public boolean chickenRetaliate = false;
private void chickenSettings() {
chickenRetaliate = getBoolean("mobs.chicken.retaliate", chickenRetaliate);
--
2.26.2