Updated purpur & ported 2 & removed 1 patch

.gitmodules

@@ -11,7 +11,7 @@
 [submodule "Purpur"]
 	path = Purpur
 	url = https://github.com/pl3xgaming/Purpur.git
-	branch = ver/1.16
+	branch = ver/1.16.2
 	update = merge
 [submodule "Empirecraft"]
 	path = Empirecraft

PATCHES.md

@@ -52,6 +52,7 @@ # Patches
 | server |  Fix 'outdated server' showing in ping before server fully      | William Blake Galbreath |  |
 | server |  Fix Bukkit.createInventory() with type LECTERN      | willies952002 |  |
 | server |  Fix exp drop of zombie pigmen (MC-56653)      | Phoenix616 |  |
+| server |  Fix incorrect return for WorldServer#addAllEntitiesSafely      | William Blake Galbreath |  |
 | server |  Fix lead fall dmg config      | tr7zw |  |
 | server |  Fix the dead lagging the server      | William Blake Galbreath |  |
 | server |  Giants AI settings      | William Blake Galbreath |  |
@@ -93,13 +94,13 @@ # Patches
 | server |  Remove stream for ender teleport      | Sotr |  |
 | server |  Remove vanilla profiler callers      | Sotr |  |
 | server |  Skip events if there's no listeners      | William Blake Galbreath |  |
-| server |  Slow down villager pickup of thrown items      | Aikar |  |
 | server |  Snowman drop and put back pumpkin      | William Blake Galbreath |  |
 | server |  Squid EAR immunity      | William Blake Galbreath |  |
 | server |  Swaps the predicate order of collision      | ㄗㄠˋ ㄑㄧˊ |  |
 | server |  Tulips change fox type      | William Blake Galbreath |  |
 | server |  Tweak Explosions      | Aikar |  |
 | server |  Use block distance in portal search radius      | Patrick Hemmer |  |
+| server |  Use configured height for nether surface builders      | William Blake Galbreath |  |
 | server |  Villagers follow emerald blocks      | William Blake Galbreath |  |
 | api |  Yatopia API Bundle      | Bud Gidiere |  |
 | server |  Yatopia-Server-Fixes      | Bud Gidiere |  |

Purpur

@@ -1 +1 @@
-Subproject commit 2b4fe114201c3a4f1208461eb24b310634f98663
+Subproject commit f801a266fbba399e9e46011b690b9b8618bd1fd4

Rainforest

@@ -1 +1 @@
-Subproject commit b463a4c44163701bd69a1110d583454a689d1ef0
+Subproject commit eb858a34d9a34a2e0af1f1ba8bf1d0b92658b8c7

patches/Empirecraft/server.txt

@@ -1 +1 @@
-Improve-Hopper-Performance&Don-t-trigger-Lootable-Refresh-for-non-player-intera&Tweak-Explosions&dont-load-chunks-for-physics&Fix-Bukkit.createInventory-with-type-LECTERN&Slow-down-villager-pickup-of-thrown-items
+Improve-Hopper-Performance&Don-t-trigger-Lootable-Refresh-for-non-player-intera&Tweak-Explosions&dont-load-chunks-for-physics&Fix-Bukkit.createInventory-with-type-LECTERN

patches/Purpur/server.txt

@@ -1 +1 @@
-Purpur-config-files&Lagging-threshold&Configurable-villager-brain-ticks&Alternative-Keepalive-Handling&Fix-outdated-server-showing-in-ping-before-server-fu&Dont-send-useless-entity-packets&Fix-the-dead-lagging-the-server&Skip-events-if-there-s-no-listeners&Add-permission-for-F3-N-debug&Configurable-TPS-Catchup&Add-option-to-disable-saving-projectiles-to-disk&Add-5-second-tps-average-in-tps&Barrels-and-enderchests-6-rows&Tulips-change-fox-type&Giants-AI-settings&Illusioners-AI-settings&Zombie-horse-naturally-spawn&Charged-creeper-naturally-spawn&Rabbit-naturally-spawn-toast-and-killer&Cows-eat-mushrooms&Snowman-drop-and-put-back-pumpkin&Allow-soil-to-moisten-from-water-directly-under-it&Option-to-toggle-milk-curing-bad-omen&Villagers-follow-emerald-blocks&Allow-leashing-villagers&Implement-respawn-anchor-explosion-options&Implement-bed-explosion-options&Entity-lifespan&Redstone-deactivates-spawners&MC-4-Fix-Item-position-desync&Breedable-Polar-Bears&Phantoms-attracted-to-crystals-and-crystals-shoot-ph&Add-option-to-disable-dolphin-treasure-searching&Add-no-tick-block-list&Allow-anvil-colors&PaperMC-Buffer-joins&Squid-EAR-immunity
+Purpur-config-files&Lagging-threshold&Configurable-villager-brain-ticks&Alternative-Keepalive-Handling&Fix-outdated-server-showing-in-ping-before-server-fu&Dont-send-useless-entity-packets&Fix-the-dead-lagging-the-server&Skip-events-if-there-s-no-listeners&Add-permission-for-F3-N-debug&Configurable-TPS-Catchup&Add-option-to-disable-saving-projectiles-to-disk&Add-5-second-tps-average-in-tps&Barrels-and-enderchests-6-rows&Tulips-change-fox-type&Giants-AI-settings&Illusioners-AI-settings&Zombie-horse-naturally-spawn&Charged-creeper-naturally-spawn&Rabbit-naturally-spawn-toast-and-killer&Cows-eat-mushrooms&Snowman-drop-and-put-back-pumpkin&Allow-soil-to-moisten-from-water-directly-under-it&Option-to-toggle-milk-curing-bad-omen&Villagers-follow-emerald-blocks&Allow-leashing-villagers&Implement-respawn-anchor-explosion-options&Implement-bed-explosion-options&Entity-lifespan&Redstone-deactivates-spawners&MC-4-Fix-Item-position-desync&Breedable-Polar-Bears&Phantoms-attracted-to-crystals-and-crystals-shoot-ph&Add-option-to-disable-dolphin-treasure-searching&Add-no-tick-block-list&Allow-anvil-colors&PaperMC-Buffer-joins&Squid-EAR-immunity&Use-configured-height-for-nether-surface-builders&Fix-incorrect-return-for-WorldServer-addAllEntitiesS

patches/server/0003-Brandings.patch

@@ -120,10 +120,10 @@ index 0000000000000000000000000000000000000000..84bc8f6586fdbb44b839a8963f721d8f
 +}
 \ No newline at end of file
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 59c31dbb4681983bbf9391805b894a6f6972ffc4..11c4e4dd5e1b20ec0aed0e46aab29605f9fa23e2 100644
+index 19f5dfbf72eef26d1f8d8ee3ec5d8086cce6f938..c66aa7682e9cf0bde8be55a649d39150a848c1fe 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1519,7 +1519,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1516,7 +1516,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
      }
  
      public String getServerModName() {
@@ -133,7 +133,7 @@ index 59c31dbb4681983bbf9391805b894a6f6972ffc4..11c4e4dd5e1b20ec0aed0e46aab29605
  
      public CrashReport b(CrashReport crashreport) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6dda54fc22f61329389b50f58c776be2b2c350e8..918b3e38121b0d820293acd40c9eff2f88b20ee1 100644
+index 68e35eb90a831c6e78c8545915385ecf93c041b3..28006de141476819f8b31c346435ce29e5076c73 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -216,7 +216,7 @@ import javax.annotation.Nullable; // Paper

patches/server/0005-Add-getLastTickMs-api.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add getLastTickMs api
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 11c4e4dd5e1b20ec0aed0e46aab29605f9fa23e2..b3eafb5ed35c8534a0e419eb184fc2624d28f4d7 100644
+index c66aa7682e9cf0bde8be55a649d39150a848c1fe..27ed50f32a4e177d9ec4360b99f0aa21168ec8b3 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -928,6 +928,8 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -28,7 +28,7 @@ index 11c4e4dd5e1b20ec0aed0e46aab29605f9fa23e2..b3eafb5ed35c8534a0e419eb184fc262
                      this.X = true;
                      // Purpur start - tps catchup
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 918b3e38121b0d820293acd40c9eff2f88b20ee1..e2a540d07c68e4ca9b2a2a46d6ba9a33903eced9 100644
+index 28006de141476819f8b31c346435ce29e5076c73..a46b8ae673405b5838e5aa5ec8cf8c950fc05c53 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2412,4 +2412,11 @@ public final class CraftServer implements Server {

patches/server/0006-Add-config-Yatopia-command-and-basic-settings.patch

@@ -390,7 +390,7 @@ index a60634fc455e8a59399020689b70eb64b6824d12..cb4a89940cf02de5c3eefc5c746397a9
          this.setAllowFlight(dedicatedserverproperties.allowFlight);
          this.setResourcePack(dedicatedserverproperties.resourcePack, this.aZ());
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 8b81bfdec79f5ddf9b3ca433e1d09553edc4e79d..968b1c878c519092150d309adf03dcfe3ae2e8ca 100644
+index 081c22835a1a0e0f903c9df569182d01c2250cc4..9717881d94d6e01fedebe65d91ffc0065860c568 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1034,7 +1034,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -423,7 +423,7 @@ index f24f7f1230a380f46112e886fb5dff7c33edb2ce..88f4c30a03e9139b0284ff1a545ad809
          if (this.isFireProof() || this.world.isClientSide) {
              this.extinguish();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index e2a540d07c68e4ca9b2a2a46d6ba9a33903eced9..d06400a15121368d526617e1cdd1cb5138b39db7 100644
+index a46b8ae673405b5838e5aa5ec8cf8c950fc05c53..946c00b34bfacf4482cc0447f711f5b6d281235d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -837,6 +837,7 @@ public final class CraftServer implements Server {

patches/server/0007-Per-entity-type-collision-settings.patch

@@ -14,7 +14,7 @@ The whole code is based around 1 class, the EntityFilter class. Whole filtering
 Co-authored-by: tr7zw <tr7zw@live.de>
 
 diff --git a/src/main/java/de/minebench/origami/OrigamiConfig.java b/src/main/java/de/minebench/origami/OrigamiConfig.java
-index 4ff73f74a0d4e0b95e67b99b551dadd3ab4d0f55..4ae94d576bf1b8e6fceb5fe1aa722ce5be2fb957 100644
+index 4caf5547d7e04ed8abfba090ac2a3f72077aca0f..1c37deb61c040950efc52fbccf7c7100fa3c992e 100644
 --- a/src/main/java/de/minebench/origami/OrigamiConfig.java
 +++ b/src/main/java/de/minebench/origami/OrigamiConfig.java
 @@ -134,6 +134,39 @@ public final class OrigamiConfig {

patches/server/0019-Option-for-simpler-Villagers.patch

@@ -21,7 +21,7 @@ index 4d718370eb544fb4eb6a1d051512f63414df8c7e..39477fcec9ea1e09b9019534f09fe3ff
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index d32581ec7f521ec53692517811c8e01dc405afbb..f351f76f840009c5b93d337249fb1361f6795c9e 100644
+index 1104196cf6dc448dada2e190e5e9e27c9f18d2dc..cb8363a93c8a0dbdfb9ac510b7140b300ad56f76 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -27,6 +27,7 @@ import org.bukkit.event.entity.VillagerReplenishTradeEvent;
@@ -32,43 +32,32 @@ index d32581ec7f521ec53692517811c8e01dc405afbb..f351f76f840009c5b93d337249fb1361
      private static final DataWatcherObject<VillagerData> br = DataWatcher.a(EntityVillager.class, DataWatcherRegistry.q);
      public static final Map<Item, Integer> bp = ImmutableMap.of(Items.BREAD, 4, Items.POTATO, 1, Items.CARROT, 1, Items.BEETROOT, 1);
      private static final Set<Item> bs = ImmutableSet.of(Items.BREAD, Items.POTATO, Items.CARROT, Items.WHEAT, Items.WHEAT_SEEDS, Items.BEETROOT, new Item[]{Items.BEETROOT_SEEDS});
-@@ -64,24 +65,60 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
+@@ -63,8 +64,14 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
+     public EntityVillager(EntityTypes<? extends EntityVillager> entitytypes, World world, VillagerType villagertype) {
          super(entitytypes, world);
          this.by = new Reputation();
++        if (!simplerVillagerBehavior) {
          ((Navigation) this.getNavigation()).a(true);
-+        if (!simplerVillagerBehavior) { // Yatopia
          this.getNavigation().d(true);
-         this.setCanPickupLoot(true);
-+        } else { // Yatopia start
++        // Yatopia start
++        } else {
 +            initPathfinder();
 +        }
 +        // Yatopia end
+         this.setCanPickupLoot(true);
          this.setVillagerData(this.getVillagerData().withType(villagertype).withProfession(VillagerProfession.NONE));
          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));
--    }
--
+@@ -74,6 +81,38 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
      @Override
-     public boolean a(EntityHuman entityhuman) {
-         return world.purpurConfig.villagerCanBeLeashed && !this.isLeashed();
-     }
-     // Purpur end
- 
-+    // Yatopia start
-+    @Override
-+    protected void initPathfinder() {
-+        if (world.purpurConfig.villagerFollowEmeraldBlock) this.goalSelector.a(3, new PathfinderGoalTempt(this, 1.0D, false, TEMPT_ITEMS));
+     protected void initPathfinder() {
+         if (world.purpurConfig.villagerFollowEmeraldBlock) this.goalSelector.a(3, new PathfinderGoalTempt(this, 1.0D, false, TEMPT_ITEMS));
++        // Yatopia start
 +        if (!simplerVillagerBehavior) {
 +            // safety
 +            return;
 +        }
 +        this.goalSelector.a(0, new PathfinderGoalFloat(this));
-+        if(dev.tr7zw.yatopia.YatopiaConfig.villagersHideAtNight) {
++        if (dev.tr7zw.yatopia.YatopiaConfig.villagersHideAtNight) {
 +            this.goalSelector.a(0, new PathfinderGoalUseItem<>(this, PotionUtil.a(new ItemStack(Items.POTION), Potions.INVISIBILITY), SoundEffects.ENTITY_WANDERING_TRADER_DISAPPEARED, (entityvillagertrader) -> {
 +                return !this.world.isDay() && !entityvillagertrader.isInvisible();
 +            }));
@@ -93,12 +82,11 @@ index d32581ec7f521ec53692517811c8e01dc405afbb..f351f76f840009c5b93d337249fb1361
 +        this.goalSelector.a(8, new PathfinderGoalRandomStrollLand(this, 0.35D));
 +        this.goalSelector.a(9, new PathfinderGoalInteract(this, EntityHuman.class, 3.0F, 1.0F));
 +        this.goalSelector.a(10, new PathfinderGoalLookAtPlayer(this, EntityInsentient.class, 8.0F));
-+    }
-+
++        // Yatopia end
+     }
+ 
      @Override
-     public BehaviorController<EntityVillager> getBehaviorController() {
-         return (BehaviorController<EntityVillager>) super.getBehaviorController(); // CraftBukkit - decompile error
-@@ -94,6 +131,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
+@@ -94,6 +133,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
  
      @Override
      protected BehaviorController<?> a(Dynamic<?> dynamic) {
@@ -106,10 +94,10 @@ index d32581ec7f521ec53692517811c8e01dc405afbb..f351f76f840009c5b93d337249fb1361
          BehaviorController<EntityVillager> behaviorcontroller = this.cJ().a(dynamic);
  
          this.a(behaviorcontroller);
-@@ -171,6 +209,27 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
-         super.inactiveTick();
+@@ -172,6 +212,28 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
      }
      // Spigot End
+ 
 +    // Yatopia start
 +    private VillagerProfession getRandomProfession() {
 +        int type = random.nextInt(13);
@@ -131,12 +119,13 @@ index d32581ec7f521ec53692517811c8e01dc405afbb..f351f76f840009c5b93d337249fb1361
 +        }
 +    }
 +    // Yatopia end
- 
++
      @Override
      protected void mobTick() { mobTick(false); }
-@@ -180,6 +239,13 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
+     protected void mobTick(boolean inactive) {
+@@ -180,6 +242,13 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
          boolean tick = (world.getTime() + brainTickOffset) % world.purpurConfig.villagerBrainTicks == 0;
-         if (world.getMinecraftServer().lagging ? tick : world.purpurConfig.villagerUseBrainTicksOnlyWhenLagging || tick)
+         if (((WorldServer) world).getMinecraftServer().lagging ? tick : world.purpurConfig.villagerUseBrainTicksOnlyWhenLagging || tick)
          // Purpur end
 +        // Yatopia start
 +        if (simplerVillagerBehavior && this.getVillagerData().getProfession() == VillagerProfession.NONE) {
@@ -148,7 +137,7 @@ index d32581ec7f521ec53692517811c8e01dc405afbb..f351f76f840009c5b93d337249fb1361
          if (!inactive) this.getBehaviorController().a((WorldServer) this.world, this); // CraftBukkit - decompile error // Paper
          //this.world.getMethodProfiler().exit(); // Akarin - remove caller
          if (this.bF) {
-@@ -345,6 +411,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
+@@ -345,6 +414,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
          return this.bD == 0 || this.bD < 2 && this.world.getTime() > this.bC + 2400L;
      }
  
@@ -156,7 +145,7 @@ index d32581ec7f521ec53692517811c8e01dc405afbb..f351f76f840009c5b93d337249fb1361
      public boolean fc() {
          long i = this.bC + 12000L;
          long j = this.world.getTime();
-@@ -367,6 +434,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
+@@ -367,6 +437,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
          return this.fn() && this.fm();
      }
  
@@ -164,7 +153,7 @@ index d32581ec7f521ec53692517811c8e01dc405afbb..f351f76f840009c5b93d337249fb1361
      private void fo() {
          int i = 2 - this.bD;
  
-@@ -597,6 +665,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
+@@ -597,6 +668,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
      }
  
      private void a(Entity entity) {
@@ -172,11 +161,11 @@ index d32581ec7f521ec53692517811c8e01dc405afbb..f351f76f840009c5b93d337249fb1361
          if (this.world instanceof WorldServer) {
              Optional<List<EntityLiving>> optional = this.bg.getMemory(MemoryModuleType.VISIBLE_MOBS);
  
-@@ -622,6 +691,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
+@@ -622,6 +694,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
      }
  
      public void a(MemoryModuleType<GlobalPos> memorymoduletype) {
-+        if (simplerVillagerBehavior) return; // Yatopia
++        if (simplerVillagerBehavior) return;
          if (this.world instanceof WorldServer) {
              MinecraftServer minecraftserver = ((WorldServer) this.world).getMinecraftServer();
  

patches/server/0022-Optimize-TileEntity-loading.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Optimize TileEntity loading
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 7c31b569af1a84e553b17ff8fd383e1f109aea3c..054880649ec3dcdcac229e2ae8d0bb9a355e0dd4 100644
+index 78144ec471df692c6eaa868c120cdba25dd55365..6363425ae3d9a7aab97afe20163cbb51ff3ab095 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -43,8 +43,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable {

patches/server/0024-Redirect-Configs.patch

@@ -32,7 +32,7 @@ index f6623032e5d4034c104aa1fc6ff4265169e462ba..c9a61bf6531d761780ac66b69d06a1d0
  
    protected static void logError(String s) {
 diff --git a/src/main/java/de/minebench/origami/OrigamiConfig.java b/src/main/java/de/minebench/origami/OrigamiConfig.java
-index 4ae94d576bf1b8e6fceb5fe1aa722ce5be2fb957..4794197d2dd3f81d2b8405f22dabe8519af9cc40 100644
+index 1c37deb61c040950efc52fbccf7c7100fa3c992e..bcfd36e96f4aa56f22cd3fe7f600979610dc07e1 100644
 --- a/src/main/java/de/minebench/origami/OrigamiConfig.java
 +++ b/src/main/java/de/minebench/origami/OrigamiConfig.java
 @@ -20,6 +20,8 @@ public final class OrigamiConfig {

patches/server/0028-Fix-lead-fall-dmg-config.patch

@@ -19,7 +19,7 @@ index 39477fcec9ea1e09b9019534f09fe3ff03bdc886..0543de8ea80322028729723fd2b500ee
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 968b1c878c519092150d309adf03dcfe3ae2e8ca..e71469504a0e9c716f50b58b21297acdc7db99f7 100644
+index 9717881d94d6e01fedebe65d91ffc0065860c568..ea174c5207a60f2c2afb50d2a3b8321f417508f6 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1265,6 +1265,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke

patches/server/0029-Optimize-player-loops-around-weather.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Optimize player loops around weather
 
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index af87989796198229fbdf6fc5cf6da42bf2eeec98..c3d7ae1ff75f6d77279255542c5de5a592720ac9 100644
+index afc3ee4ccd482c194fb8fe681c02e086655b27ad..c8a7fd3108d5e463bb16875d70675dc0fa09a26c 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -814,12 +814,17 @@ public class WorldServer extends World implements GeneratorAccessSeed {

patches/server/0032-Use-block-distance-in-portal-search-radius.patch

@@ -12,7 +12,7 @@ This changes it so that the portal list is filtered to only include portals with
 Ported to Yatopia and added per world config option by MrIvanPlays <ivan@mrivanplays.com>
 
 diff --git a/src/main/java/de/minebench/origami/OrigamiConfig.java b/src/main/java/de/minebench/origami/OrigamiConfig.java
-index 4794197d2dd3f81d2b8405f22dabe8519af9cc40..dfb7a053ed0e64734a0c227c566109074321dddd 100644
+index bcfd36e96f4aa56f22cd3fe7f600979610dc07e1..6d1295757ac0bc73ab3fa29b05d18e3dd04876ea 100644
 --- a/src/main/java/de/minebench/origami/OrigamiConfig.java
 +++ b/src/main/java/de/minebench/origami/OrigamiConfig.java
 @@ -171,6 +171,11 @@ public final class OrigamiConfig {
@@ -28,12 +28,12 @@ index 4794197d2dd3f81d2b8405f22dabe8519af9cc40..dfb7a053ed0e64734a0c227c56610907
      }
  
 diff --git a/src/main/java/net/minecraft/server/PortalTravelAgent.java b/src/main/java/net/minecraft/server/PortalTravelAgent.java
-index 5dce3c862166783e1fc479cd4ecce8b80daa90b2..eb33c274182ec3cdde5d35e028617357c1355782 100644
+index fcbde0664226841c2b005001075b1e76d8cc6289..2f1d52fe2c256a4fbe63cb7a7fdc5008462085c4 100644
 --- a/src/main/java/net/minecraft/server/PortalTravelAgent.java
 +++ b/src/main/java/net/minecraft/server/PortalTravelAgent.java
-@@ -30,12 +30,22 @@ public class PortalTravelAgent {
-             return villageplacerecord.f().getY();
-         });
+@@ -31,12 +31,22 @@ public class PortalTravelAgent {
+         boolean seen = false;
+         VillagePlaceRecord best = null;
          java.util.List<VillagePlaceRecord> list = villageplace.b(type -> type == VillagePlaceType.v, blockposition, i, VillagePlace.Occupancy.ANY).collect(java.util.stream.Collectors.toList());
 +        // Yatopia start - fix portal bug
 +        if (world.origamiConfig.useBlockDistanceInPortalSearchRadius) {

scripts/fetchUpstream.sh

@@ -17,7 +17,7 @@ function updateAll {
   update Akarin 1.16.2
   update Empirecraft ver/1.16.2
   update Origami 1.16
-  update Purpur ver/1.16
+  update Purpur ver/1.16.2
   update Rainforest ver/1.16
   update Tuinity 1.16.2tmp
   git submodule update --recursive