Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@408a905 Don't put entities removed during the portal exit event into an invalid state

gradle.properties

@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
 version = 1.20.1-R0.1-SNAPSHOT
 
 mcVersion = 1.20.1
-paperCommit = ef2b574c6ad58a5105e64b4e6204ef6a5369efc5
+paperCommit = 408a9050baf29341b877a7bebff0939442d818d0
 
 org.gradle.caching = true
 org.gradle.parallel = true

patches/server/0001-Pufferfish-Server-Changes.patch

@@ -1935,7 +1935,7 @@ index 04b1531572e8fff1e46fe1c94e7fc863841e0f66..47ddc42f2b63d9d3fae5ae6ea93d4183
      int LARGE_MAX_STACK_SIZE = 64;
      int DEFAULT_DISTANCE_LIMIT = 8;
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index f189629f03503fc06b790729bd407b663a48e0db..02722358edf416e958e9181b2ecc781596801f8a 100644
+index 2edab21bb271405f200de5a19e9c748bb14aba7d..886c01e4df3c6d301d4603e6c097fe55fdfbae75 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -306,7 +306,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -2021,7 +2021,7 @@ index f189629f03503fc06b790729bd407b663a48e0db..02722358edf416e958e9181b2ecc7815
          this.baseTick();
      }
 
-@@ -4288,16 +4322,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4293,16 +4327,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
 
      public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tag, double speed) {
@@ -2047,7 +2047,7 @@ index f189629f03503fc06b790729bd407b663a48e0db..02722358edf416e958e9181b2ecc7815
              double d1 = 0.0D;
              boolean flag = this.isPushedByFluid();
              boolean flag1 = false;
-@@ -4305,14 +4341,61 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4310,14 +4346,61 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              int k1 = 0;
              BlockPos.MutableBlockPos blockposition_mutableblockposition = new BlockPos.MutableBlockPos();
 
@@ -2115,7 +2115,7 @@ index f189629f03503fc06b790729bd407b663a48e0db..02722358edf416e958e9181b2ecc7815
 
                              if (d2 >= axisalignedbb.minY) {
                                  flag1 = true;
-@@ -4334,9 +4417,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4339,9 +4422,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                                  // CraftBukkit end
                              }
                          }

patches/server/0007-Component-related-conveniences.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Component related conveniences
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index d4e03454b07550621dd1a56e4eaa40f3b49d8c2f..a0577dcae567230c12b52ed02072745513c7a4d5 100644
+index a3b148c9d55ba35856ffc505f1950ec986d85ece..1e8edb73baf8e5ca1bbde068c8141de505de48ee 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1775,6 +1775,26 @@ public class ServerPlayer extends Player {
@@ -36,7 +36,7 @@ index d4e03454b07550621dd1a56e4eaa40f3b49d8c2f..a0577dcae567230c12b52ed020727455
      public void displayClientMessage(Component message, boolean overlay) {
          this.sendSystemMessage(message, overlay);
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index fff7ad7a45f310783ac96b44575ad3db13d537fa..c3f76eaf59b1ed728e8b430ebd69b58bfbad95a1 100644
+index 640e9bd618dc8286933318744c2064ede1fd9b5f..84846522b57f07001a0d1cb88db625910bea9571 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1037,6 +1037,20 @@ public abstract class PlayerList {
@@ -81,10 +81,10 @@ index 25a5a3b949a0eb632611355e74ccd4865be108ca..14fcfd7c1d3a62833978e163f4e0d6f9
          return this.type().msgId();
      }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index cccbec265c00b00c3261c9beead91f1ab3702d7d..fa14eb380c6392c74ef96acfae58034d583f2c3e 100644
+index 886c01e4df3c6d301d4603e6c097fe55fdfbae75..d6d253d854ef00ffd229e513c364712e0c4bf354 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4040,6 +4040,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4045,6 +4045,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          return SlotAccess.NULL;
      }
 

patches/server/0008-Ridables.patch

@@ -79,7 +79,7 @@ index e7f05af80292b7e60018a9b1d83616cf2f6e64e8..c7748f6d1a460d8d832616b6a16219be
                              if ((entity instanceof Bucketable && entity instanceof LivingEntity && origItem != null && origItem.asItem() == Items.WATER_BUCKET) && (event.isCancelled() || ServerGamePacketListenerImpl.this.player.getInventory().getSelected() == null || ServerGamePacketListenerImpl.this.player.getInventory().getSelected().getItem() != origItem)) {
                                  entity.getEntityData().resendPossiblyDesyncedEntity(player); // Paper - The entire mob gets deleted, so resend it.
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 637de99a0893001200f84a910e910101499ceb9b..64cbc88887de72157f977186691d034a09462a85 100644
+index d6d253d854ef00ffd229e513c364712e0c4bf354..5d781a20c3a954458f12751c74c54874ff99bc22 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -376,7 +376,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -120,7 +120,7 @@ index 637de99a0893001200f84a910e910101499ceb9b..64cbc88887de72157f977186691d034a
              if (this.passengers.size() == 1 && this.passengers.get(0) == entity) {
                  this.passengers = ImmutableList.of();
              } else {
-@@ -4888,4 +4903,45 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4893,4 +4908,45 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          return ((net.minecraft.server.level.ServerChunkCache) level.getChunkSource()).isPositionTicking(this);
      }
      // Paper end

patches/server/0086-Stop-squids-floating-on-top-of-water.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Stop squids floating on top of water
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 64a644e750887452a7dbd1dbaab32289e95680fe..ed34b0d7ee6263821412f4ffa5e85ee05922a936 100644
+index 8cd1644d7f95ad5000d680f2790f5d109111167f..5420075f774e2327d17ecbf6fd1afba0b96ff1f4 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4354,6 +4354,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4359,6 +4359,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          this.yRotO = this.getYRot();
      }
 

patches/server/0088-Entities-can-use-portals-configuration.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Entities can use portals configuration
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index ed34b0d7ee6263821412f4ffa5e85ee05922a936..c565d863808a9facd561fb9704c2a9ce4ba2d5e2 100644
+index 5420075f774e2327d17ecbf6fd1afba0b96ff1f4..9be349874c40722f05ad5b81e62dcd0098acc7c4 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3061,7 +3061,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -17,7 +17,7 @@ index ed34b0d7ee6263821412f4ffa5e85ee05922a936..c565d863808a9facd561fb9704c2a9ce
              if (!this.level().isClientSide && !pos.equals(this.portalEntrancePos)) {
                  this.portalEntrancePos = pos.immutable();
              }
-@@ -3757,7 +3757,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3762,7 +3762,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
 
      public boolean canChangeDimensions() {

patches/server/0271-Remove-Mojang-Profiler.patch

@@ -819,7 +819,7 @@ index 7b962da50664abedc676e931a422e6789b0e4dbf..20200dfe5b6af64083562dc748bfaf43
                  this.connection.send(new ClientboundPlayerAbilitiesPacket(this.getAbilities()));
                  playerlist.sendLevelInfo(this, worldserver);
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index f4cf73b3a12ecf2230d1e265e6be2d261e70a659..ea017dd7db03c25db92c57e802a598670a6824e6 100644
+index 502f518bb474c0a0a5f9e8ca03345e5bab5fbbfb..c08e1745cf1ae9914db64fdc9dbe52f3da50ffec 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -412,7 +412,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -1045,7 +1045,7 @@ index 2e6e8eac987c4ef6b2dcd3de592d8a51d2b29792..863343a87fe34d72f04af89d75268b47
              };
          }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index bb33d6509aad8bd7005966f090d4376e5a7ff6ac..f6efe46f7afa5a187233bf16859537e37e91edb5 100644
+index 44d5403615244b3971df8f40fe7269654b216679..15f6e27c5c87532ab41e0808a7bbed56569ba93b 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -438,7 +438,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -1157,7 +1157,7 @@ index bb33d6509aad8bd7005966f090d4376e5a7ff6ac..f6efe46f7afa5a187233bf16859537e3
              PortalInfo shapedetectorshape = (location == null) ? this.findDimensionEntryPoint(worldserver) : new PortalInfo(new Vec3(location.x(), location.y(), location.z()), Vec3.ZERO, this.yRot, this.xRot, worldserver, null); // CraftBukkit
 
              if (shapedetectorshape == null) {
-@@ -3629,7 +3629,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3634,7 +3634,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                  this.unRide();
                  // CraftBukkit end
 
@@ -1166,7 +1166,7 @@ index bb33d6509aad8bd7005966f090d4376e5a7ff6ac..f6efe46f7afa5a187233bf16859537e3
                  // Paper start - Change lead drop timing to prevent dupe
                  if (this instanceof Mob) {
                      ((Mob) this).dropLeash(true, true); // Paper drop lead
-@@ -3652,10 +3652,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3657,10 +3657,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                  }
 
                  this.removeAfterChangingDimensions();