Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
5fd19303f Call PreCreatureSpawnEvent for more spawn reasons (#5201)

patches/server/0003-Purpur-config-files.patch

@@ -65,7 +65,7 @@ index ecff0657e5666ddc2e6a5c3111bfb2b8dd2b78d3..3ee8d31c453105eca7b96bede39a9ebb
          // Paper end
          com.tuinity.tuinity.config.TuinityConfig.init((java.io.File) options.valueOf("tuinity-settings")); // Tuinity - Server Config
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index de9ea6770b8afc5e1020bef04ac6cca93b6b420c..21d0570a59240e955ff148bac0226b220a7dec36 100644
+index c8b7ab17d53c302698fa7f9850c18e474832a585..f7a673544e6dccbed33359973ce59e8f25000550 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -166,7 +166,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation

patches/server/0015-PlayerSetSpawnerTypeWithEggEvent.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] PlayerSetSpawnerTypeWithEggEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
-index bf914dc5ee7f2d4a324b6711ea273f5581ec84ad..1138981aebb7fbb3f3839dcd221e3ee850ab4456 100644
+index 93b5a6471cde31739d2bd5f2a9fc0e0d974d0eb0..36f572990a0c08f21df6f4dc40c5878b669ca00c 100644
 --- a/src/main/java/net/minecraft/server/EntityTypes.java
 +++ b/src/main/java/net/minecraft/server/EntityTypes.java
 @@ -143,6 +143,16 @@ public class EntityTypes<T extends Entity> {
@@ -25,7 +25,7 @@ index bf914dc5ee7f2d4a324b6711ea273f5581ec84ad..1138981aebb7fbb3f3839dcd221e3ee8
      public static MinecraftKey getName(EntityTypes<?> entitytypes) {
          return IRegistry.ENTITY_TYPE.getKey(entitytypes);
      }
-@@ -287,6 +297,16 @@ public class EntityTypes<T extends Entity> {
+@@ -301,6 +311,16 @@ public class EntityTypes<T extends Entity> {
          return this.bg;
      }
 
@@ -42,7 +42,7 @@ index bf914dc5ee7f2d4a324b6711ea273f5581ec84ad..1138981aebb7fbb3f3839dcd221e3ee8
      public String getDescriptionId() { return f(); } // Paper - OBFHELPER
      public String f() {
          if (this.bo == null) {
-@@ -296,6 +316,7 @@ public class EntityTypes<T extends Entity> {
+@@ -310,6 +330,7 @@ public class EntityTypes<T extends Entity> {
          return this.bo;
      }
 

patches/server/0016-EMC-MonsterEggSpawnEvent.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] EMC - MonsterEggSpawnEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
-index 1138981aebb7fbb3f3839dcd221e3ee850ab4456..37b984a5b6c1c6e146e1c4b0947d1e39a051cfbb 100644
+index 36f572990a0c08f21df6f4dc40c5878b669ca00c..9024af41ef5828e1c7c746498a033435e1bddc28 100644
 --- a/src/main/java/net/minecraft/server/EntityTypes.java
 +++ b/src/main/java/net/minecraft/server/EntityTypes.java
-@@ -187,19 +187,46 @@ public class EntityTypes<T extends Entity> {
+@@ -187,13 +187,20 @@ public class EntityTypes<T extends Entity> {
 
      @Nullable
      public Entity spawnCreature(WorldServer worldserver, @Nullable ItemStack itemstack, @Nullable EntityHuman entityhuman, BlockPosition blockposition, EnumMobSpawn enummobspawn, boolean flag, boolean flag1) {
@@ -31,7 +31,10 @@ index 1138981aebb7fbb3f3839dcd221e3ee850ab4456..37b984a5b6c1c6e146e1c4b0947d1e39
      }
 
      @Nullable
-     public T spawnCreature(WorldServer worldserver, @Nullable NBTTagCompound nbttagcompound, @Nullable IChatBaseComponent ichatbasecomponent, @Nullable EntityHuman entityhuman, BlockPosition blockposition, EnumMobSpawn enummobspawn, boolean flag, boolean flag1, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason spawnReason) {
+@@ -212,8 +219,28 @@ public class EntityTypes<T extends Entity> {
+             }
+         }
+         // Paper end
 +        // Purpur start
 +        return spawnCreature(worldserver, null, nbttagcompound, ichatbasecomponent, entityhuman, blockposition, enummobspawn, flag, flag1, spawnReason);
 +    }

patches/server/0019-Configurable-villager-brain-ticks.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable villager brain ticks
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index 21d0570a59240e955ff148bac0226b220a7dec36..c034869310ca3dadbfe5425c45aaa80dac59ac88 100644
+index f7a673544e6dccbed33359973ce59e8f25000550..167794625ccab695e9404e50366ba92dace6b204 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -58,6 +58,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation

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

@@ -5,7 +5,7 @@ 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 c034869310ca3dadbfe5425c45aaa80dac59ac88..1cde71b812c7721298e7addb74de01e4ea297499 100644
+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

patches/server/0063-Allow-leashing-villagers.patch

@@ -17,7 +17,7 @@ index ac6460d261014bb4b9878c96e4b447f7a471752d..fe721a8aac68c07476ad44244f00dc5e
              // Paper start - drop leash variable
              PlayerUnleashEntityEvent event = CraftEventFactory.callPlayerUnleashEntityEvent(this, entityhuman, !entityhuman.abilities.canInstantlyBuild);
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index 1cde71b812c7721298e7addb74de01e4ea297499..e4aedb3df5d0a47b5bb9175627aa794fc1779639 100644
+index fc15fd3cb9e443b4ee4e09d98ad0b156b6dc61ad..477f4d3c5b3c17d9350edb7b6d0fee6a1729a255 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -79,6 +79,11 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation

patches/server/0064-Implement-configurable-search-radius-for-villagers-t.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Implement configurable search radius for villagers to spawn
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index e4aedb3df5d0a47b5bb9175627aa794fc1779639..c06425434c97645b914c07940528901a2979ce1b 100644
+index 477f4d3c5b3c17d9350edb7b6d0fee6a1729a255..b8f1a8add52eb67a0fbedc1eab497ffa6591123e 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -894,6 +894,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation

patches/server/0091-Configurable-villager-breeding.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable villager breeding
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index c06425434c97645b914c07940528901a2979ce1b..a0bfef54c853d57c9a5c6d3f9f19591649295357 100644
+index b8f1a8add52eb67a0fbedc1eab497ffa6591123e..eb8c84977bc757494c08588d2566f402a17357fa 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -642,7 +642,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation

patches/server/0103-Short-enderman-height.patch

@@ -17,7 +17,7 @@ index 7b175240e44b0c7eb5044d7bcaf54dac22f50f2a..e3364032669b473c799b759f5f89468b
              if (this.tryEscape(EndermanEscapeEvent.Reason.INDIRECT)) { // Paper start
              for (int i = 0; i < 64; ++i) {
 diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
-index 37b984a5b6c1c6e146e1c4b0947d1e39a051cfbb..919cf670327bed6faa50f29c9bf7a9b54174f7f2 100644
+index 9024af41ef5828e1c7c746498a033435e1bddc28..73cf30786d2b4d6f87be5f9aad87c3edb594d18e 100644
 --- a/src/main/java/net/minecraft/server/EntityTypes.java
 +++ b/src/main/java/net/minecraft/server/EntityTypes.java
 @@ -137,7 +137,8 @@ public class EntityTypes<T extends Entity> {

patches/server/0105-Ridables.patch

@@ -4325,7 +4325,7 @@ index ed6a47ad2fd973695fbb151d1a44000ec3639e54..ac75ed3e2e0e0cd8f91de9ff188e1735
                  Vec3D vec3d = new Vec3D(this.b - EntityVex.this.locX(), this.c - EntityVex.this.locY(), this.d - EntityVex.this.locZ());
                  double d0 = vec3d.f();
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index a0bfef54c853d57c9a5c6d3f9f19591649295357..548a993a1de939396d075f9176e0d60eebc7b010 100644
+index eb8c84977bc757494c08588d2566f402a17357fa..bc82946d8869f89a9624bebf8dc1099d0f6bd126 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -75,8 +75,19 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation

patches/server/0147-Lobotomize-stuck-villagers.patch

@@ -18,7 +18,7 @@ index 444305d11eb1652b8618b5e2a41992974622e1a0..b861922586dc08a660050e9f2f94433b
      public float yaw;
      public float pitch;
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index 548a993a1de939396d075f9176e0d60eebc7b010..b3f71c9dcada0ae14172c5694564a9f54a6e556e 100644
+index bc82946d8869f89a9624bebf8dc1099d0f6bd126..f9b91ab5e5c17d62acaf2edd72ad99d8d9548c85 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -187,15 +187,37 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation

patches/server/0148-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch

@@ -133,7 +133,7 @@ index 2d91869660c36b4cd7bfe887956a26802cce7f8a..e376306bc2555620d1a61af2296f3dd8
          } else {
              object = new BehaviorWork();
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index b3f71c9dcada0ae14172c5694564a9f54a6e556e..60962553e4f374b38de82f2cd4d72cef3d956c72 100644
+index f9b91ab5e5c17d62acaf2edd72ad99d8d9548c85..9b7b26a62f04b9dea6a613fc0e7006a517ac36b9 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -131,7 +131,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation

patches/server/0153-Configurable-entity-base-attributes.patch

@@ -1149,7 +1149,7 @@ index ac75ed3e2e0e0cd8f91de9ff188e173591443b72..af85dcc824e4ad50eca2ccd957da7b68
 
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index 60962553e4f374b38de82f2cd4d72cef3d956c72..eef51f8e5734b897164ca9514e7b49b2678416e6 100644
+index 9b7b26a62f04b9dea6a613fc0e7006a517ac36b9..ec6e5766d3a7e77e0698093d966bd5a96775f642 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -95,6 +95,11 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation

patches/server/0174-Add-unsafe-Entity-serialization-API.patch

@@ -17,10 +17,10 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
-index 919cf670327bed6faa50f29c9bf7a9b54174f7f2..631eb682e81e30d2a937fd1eafccd8a9ab82d21e 100644
+index 73cf30786d2b4d6f87be5f9aad87c3edb594d18e..f5fb3b3c08a05bede7ed1141c018bd0d16a19244 100644
 --- a/src/main/java/net/minecraft/server/EntityTypes.java
 +++ b/src/main/java/net/minecraft/server/EntityTypes.java
-@@ -380,6 +380,7 @@ public class EntityTypes<T extends Entity> {
+@@ -394,6 +394,7 @@ public class EntityTypes<T extends Entity> {
          return this.bf.create(this, world);
      }