Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
d6eda567 Provide a useful PluginClassLoader#toString
a3fdafbd Restore Serialization Improvements again, wasn't an issue.
0e441c79 Revert "Improve Chat Component Legacy Serialization more"
53ef67b8 Improve Chat Component Legacy Serialization more
afc1fcfc Fix serialization of colors from components
eaa76a31 Add Villager Tasks to EAR inactive tick to keep behavior
357b52fd Improve Chunk Prioritization / Load Order
a76bc402 Improve Chunk Status Transition Speed
7a2b345b Synchronize DataPaletteBlock instead of ReentrantLock
This commit is contained in:
William Blake Galbreath
2020-05-31 18:20:17 -05:00
parent a032d548bf
commit c2c6a6efd9
13 changed files with 160 additions and 160 deletions

View File

@@ -1,4 +1,4 @@
From 6c92ee4961a37a0a09521f8d0231b305f7efa90e Mon Sep 17 00:00:00 2001
From ca8de54be4a0841046f39331f7195585f3182389 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Mon, 22 Jul 2019 17:32:17 -0500
Subject: [PATCH] Implement configurable search radius for villagers to spawn
@@ -10,10 +10,10 @@ Subject: [PATCH] Implement configurable search radius for villagers to spawn
2 files changed, 5 insertions(+)
diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
index 315440b3f..fe0e646ea 100644
index e3322fedd7..2153b36a3c 100644
--- a/src/main/java/net/minecraft/server/EntityVillager.java
+++ b/src/main/java/net/minecraft/server/EntityVillager.java
@@ -903,6 +903,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -918,6 +918,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@Nullable
private EntityIronGolem fb() {
@@ -22,7 +22,7 @@ index 315440b3f..fe0e646ea 100644
int i = 0;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 284054db4..f60c4b629 100644
index 284054db42..f60c4b6291 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -781,6 +781,8 @@ public class PurpurWorldConfig {