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 8c6e31aad5ddf16ee331bb670740abb2a83aaf8d 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, 12 May 2019 00:43:12 -0500
Subject: [PATCH] Giants AI settings
---
.../minecraft/server/AttributeMapBase.java | 1 +
.../java/net/minecraft/server/Entity.java | 2 +-
.../minecraft/server/EntityGiantZombie.java | 63 ++++++++++++++++++-
.../minecraft/server/EntityInsentient.java | 6 +-
.../net/minecraft/server/EntityLiving.java | 2 +-
.../net/pl3x/purpur/PurpurWorldConfig.java | 17 +++++
6 files changed, 86 insertions(+), 5 deletions(-)
diff --git a/src/main/java/net/minecraft/server/AttributeMapBase.java b/src/main/java/net/minecraft/server/AttributeMapBase.java
index c57e23e16..92aa104dc 100644
@@ -192,6 +184,3 @@ index 88e271574..b1aca6526 100644
public int villagerBrainTicks = 1;
public boolean villagerUseBrainTicksOnlyWhenLagging = true;
private void villagerSettings() {
--
2.26.2