Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
466820160 Upstream Update (#5211)
2a0ee4b65 Add support for hex color codes in console
4e958e229 We're going on an Adventure! (#4842)
1a9735611 Stop loop when flags set to false (#5101)
a5928db4a [Auto] Updated Upstream (CraftBukkit)

patches/server/0062-Villagers-follow-emerald-blocks.patch

@@ -1,71 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Fri, 29 Nov 2019 22:10:12 -0600
-Subject: [PATCH] Villagers follow emerald blocks
-
-
-diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index 167794625ccab695e9404e50366ba92dace6b204..fc15fd3cb9e443b4ee4e09d98ad0b156b6dc61ad 100644
---- a/src/main/java/net/minecraft/server/EntityVillager.java
-+++ b/src/main/java/net/minecraft/server/EntityVillager.java
-@@ -74,6 +74,13 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
-         this.brainTickOffset = getRandom().nextInt(100); // Purpur
-     }
- 
-+    // Purpur start
-+    @Override
-+    protected void initPathfinder() {
-+        if (world.purpurConfig.villagerFollowEmeraldBlock) this.goalSelector.a(3, new PathfinderGoalTempt(this, 1.0D, false, TEMPT_ITEMS));
-+    }
-+    // Purpur end
-+
-     @Override
-     public BehaviorController<EntityVillager> getBehaviorController() {
-         return (BehaviorController<EntityVillager>) super.getBehaviorController(); // CraftBukkit - decompile error
-diff --git a/src/main/java/net/minecraft/server/EntityVillagerAbstract.java b/src/main/java/net/minecraft/server/EntityVillagerAbstract.java
-index b2a76db173ae12bff2e8a7de411cb489fdb2e9c7..2a5eda6a7e67d0b8682a96552248ea4e117c1196 100644
---- a/src/main/java/net/minecraft/server/EntityVillagerAbstract.java
-+++ b/src/main/java/net/minecraft/server/EntityVillagerAbstract.java
-@@ -17,6 +17,8 @@ import io.papermc.paper.event.player.PlayerTradeEvent;
- 
- public abstract class EntityVillagerAbstract extends EntityAgeable implements NPC, IMerchant {
- 
-+    static final RecipeItemStack TEMPT_ITEMS = RecipeItemStack.a(Blocks.EMERALD_BLOCK.getItem()); // Purpur
-+
-     // CraftBukkit start
-     private CraftMerchant craftMerchant;
- 
-diff --git a/src/main/java/net/minecraft/server/EntityVillagerTrader.java b/src/main/java/net/minecraft/server/EntityVillagerTrader.java
-index fa3e786cd6ef67da378a5d51583ca84a82677d8c..47a89bdd163d4690fa96f63d7a9723b3bcc9fa0b 100644
---- a/src/main/java/net/minecraft/server/EntityVillagerTrader.java
-+++ b/src/main/java/net/minecraft/server/EntityVillagerTrader.java
-@@ -41,6 +41,7 @@ public class EntityVillagerTrader extends EntityVillagerAbstract {
-         this.goalSelector.a(1, new PathfinderGoalPanic(this, 0.5D));
-         this.goalSelector.a(1, new PathfinderGoalLookAtTradingPlayer(this));
-         this.goalSelector.a(2, new EntityVillagerTrader.a(this, 2.0D, 0.35D));
-+        if (world.purpurConfig.villagerTraderFollowEmeraldBlock) this.goalSelector.a(3, new PathfinderGoalTempt(this, 1.0D, false, TEMPT_ITEMS)); // Purpur
-         this.goalSelector.a(4, new PathfinderGoalMoveTowardsRestriction(this, 0.35D));
-         this.goalSelector.a(8, new PathfinderGoalRandomStrollLand(this, 0.35D));
-         this.goalSelector.a(9, new PathfinderGoalInteract(this, EntityHuman.class, 3.0F, 1.0F));
-diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index edcbec38dfb5b32f4b8ba40c7a1ac6e26f0a4c3b..a1f85ef007f2ed410f1662405b0b1175c544e0b6 100644
---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -286,10 +286,17 @@ public class PurpurWorldConfig {
-     public int villagerBrainTicks = 1;
-     public boolean villagerUseBrainTicksOnlyWhenLagging = true;
-     public boolean villagerFarmingBypassMobGriefing = false;
-+    public boolean villagerFollowEmeraldBlock = false;
-     private void villagerSettings() {
-         villagerBrainTicks = getInt("mobs.villager.brain-ticks", villagerBrainTicks);
-         villagerUseBrainTicksOnlyWhenLagging = getBoolean("mobs.villager.use-brain-ticks-only-when-lagging", villagerUseBrainTicksOnlyWhenLagging);
-         villagerFarmingBypassMobGriefing = getBoolean("mobs.villager.bypass-mob-griefing", villagerFarmingBypassMobGriefing);
-+        villagerFollowEmeraldBlock = getBoolean("mobs.villager.follow-emerald-blocks", villagerFollowEmeraldBlock);
-+    }
-+
-+    public boolean villagerTraderFollowEmeraldBlock = false;
-+    private void villagerTraderSettings() {
-+        villagerTraderFollowEmeraldBlock = getBoolean("mobs.wandering_trader.follow-emerald-blocks", villagerTraderFollowEmeraldBlock);
-     }
- 
-     public boolean witherSkeletonTakesWitherDamage = false;