Update Upstream (Paper)

gradle.properties

@@ -4,7 +4,7 @@ version = 1.17.1-R0.1-SNAPSHOT
 mcVersion = 1.17.1
 packageVersion = 1_17_R1
 
-paperCommit = e8f787219d8c3d98256cc7af2a40584463651a87
+paperCommit = b750837b0525c4bcac8121ca6ed02d572e1a0ecc
 
 org.gradle.caching = true
 org.gradle.parallel = true

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

@@ -90,7 +90,7 @@ index 218f5bafeed8551b55b91c7fccaf6935c8b631ca..9d70f944af2c81ab5ab23b06857d740d
                  metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> {
                      Map<String, Map<String, Integer>> map = new HashMap<>();
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 5fd8f682d0a76bf804137018e1d3d4b44a31d9f7..25f1656a47037b0245cdd32e475b41e64dbad1de 100644
+index 83811726fc97d6288b7489d3cc48b86a5fbc33bd..7314fa88c7ee5185664f92aa064eaa38d8f5839d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -202,16 +202,26 @@ public class PaperConfig {
@@ -1640,10 +1640,10 @@ index 7b6c547e71230fbb3733f99a4597b3f5b51547b8..8242200f073aee40482b190c7c0aafd5
          this.setPvpAllowed(dedicatedserverproperties.pvp);
          this.setFlightAllowed(dedicatedserverproperties.allowFlight);
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index fdc538afae89f40c7e71ef3ae1825adc88e18e62..8596bb86c917acc6ddabf5c2a489103652ad2895 100644
+index 9bb61ea359693f69a570f60be30f8b9b59ab0d19..00bd9c816a62791e892724ebfca08f3cce3645ff 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -2452,8 +2452,28 @@ Sections go from 0..16. Now whenever a section is not empty, it can potentially
+@@ -2455,8 +2455,28 @@ Sections go from 0..16. Now whenever a section is not empty, it can potentially
              return ChunkMap.this.level.getServer().getScaledTrackingDistance(initialDistance);
          }
  
@@ -1672,7 +1672,7 @@ index fdc538afae89f40c7e71ef3ae1825adc88e18e62..8596bb86c917acc6ddabf5c2a4891036
              Iterator iterator = this.entity.getIndirectPassengers().iterator();
  
              while (iterator.hasNext()) {
-@@ -2465,6 +2485,9 @@ Sections go from 0..16. Now whenever a section is not empty, it can potentially
+@@ -2468,6 +2488,9 @@ Sections go from 0..16. Now whenever a section is not empty, it can potentially
                      i = j;
                  }
              }
@@ -1683,7 +1683,7 @@ index fdc538afae89f40c7e71ef3ae1825adc88e18e62..8596bb86c917acc6ddabf5c2a4891036
              return this.scaledRange(i);
          }
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 4973adc524d2b10c1826b1b505c4b50f933befb9..ec326db06ac886f9ca069c5604574e35f4c6ef1f 100644
+index 6b5d0d15c8de2c783a49a0369342fe67c1a511fa..c6da3c0dd65671851fdbc0cf7a6e32e92be3b968 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -985,6 +985,7 @@ public class ServerChunkCache extends ChunkSource {
@@ -1884,7 +1884,7 @@ index 7437f01ca8f416e2c9150250e324af4725a4efb6..bdcd0e38a3ba904811112f41d8bfbfc0
      int LARGE_MAX_STACK_SIZE = 64;
  
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 2a3d2dbd764c3f86430bda78d3ae9431ae9015c8..16ee8991b8993c243b23131da7d4790d9c71bccd 100644
+index cfe6921b8da87c5dd09772988fb8e4e0da541cd9..d898b5c55f7659a344259cc0d5bc4abfb837eb15 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -338,6 +338,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -1920,7 +1920,7 @@ index 2a3d2dbd764c3f86430bda78d3ae9431ae9015c8..16ee8991b8993c243b23131da7d4790d
 +    }
 +
      public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<ServerPlayer> getPlayersInTrackRange() {
-         // Paper start - determine highest range of passengers
+         // determine highest range of passengers
          if (this.passengers.isEmpty()) {
              return ((ServerLevel)this.level).getChunkSource().chunkMap.playerEntityTrackerTrackMaps[this.trackingRangeType.ordinal()]
                  .getObjectsInRange(MCUtil.getCoordinateKey(this));
@@ -1945,8 +1945,8 @@ index 2a3d2dbd764c3f86430bda78d3ae9431ae9015c8..16ee8991b8993c243b23131da7d4790d
 +        // Airplane end
  
          return chunkMap.playerEntityTrackerTrackMaps[type.ordinal()].getObjectsInRange(MCUtil.getCoordinateKey(this));
-         // Paper end - determine highest range of passengers
+     }
-@@ -2435,9 +2461,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -2434,9 +2460,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
  
              // Paper start
              return io.papermc.paper.util.CollisionUtil.getCollisionsForBlocksOrWorldBorder(this.level, this, axisalignedbb, null,

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

@@ -103,10 +103,10 @@ index ad9fb50791779a5fe7d22268b71bd10d9c9ff3f0..1c1602f839828252748e1acacfe42c7c
          this.server.sendMessage(message, sender);
          Iterator iterator = this.players.iterator();
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 16ee8991b8993c243b23131da7d4790d9c71bccd..cfbca7cc9cfde0a17f13487bde3471445568cbb8 100644
+index d898b5c55f7659a344259cc0d5bc4abfb837eb15..10661ecad0942b4ecd5cf0b23f8bcdcdaacfe3de 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3592,6 +3592,34 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -3591,6 +3591,34 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
          return SlotAccess.NULL;
      }
  

patches/server/0007-Ridables.patch

@@ -86,7 +86,7 @@ index 2dc4c7695dab7d03316f5473e29baa1db29debf2..eaca5e3c6d26d5fff1eae1cacabfd389
                          if ((entity instanceof AbstractFish && origItem != null && origItem.asItem() == Items.WATER_BUCKET) && (event.isCancelled() || ServerGamePacketListenerImpl.this.player.getInventory().getSelected() == null || ServerGamePacketListenerImpl.this.player.getInventory().getSelected().getItem() != origItem)) {
                              ServerGamePacketListenerImpl.this.send(new ClientboundAddMobPacket((AbstractFish) entity));
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index cfbca7cc9cfde0a17f13487bde3471445568cbb8..4fc93b94c97a0b9bca7de40d7db8c3f02104b1bd 100644
+index 10661ecad0942b4ecd5cf0b23f8bcdcdaacfe3de..15d3f860c5ad3dc849d943bd86114af3a8c04c82 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -230,7 +230,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -107,7 +107,7 @@ index cfbca7cc9cfde0a17f13487bde3471445568cbb8..4fc93b94c97a0b9bca7de40d7db8c3f0
      private float eyeHeight;
      public boolean isInPowderSnow;
      public boolean wasInPowderSnow;
-@@ -2628,6 +2628,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -2627,6 +2627,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
                  this.passengers = ImmutableList.copyOf(list);
              }
  
@@ -120,7 +120,7 @@ index cfbca7cc9cfde0a17f13487bde3471445568cbb8..4fc93b94c97a0b9bca7de40d7db8c3f0
          }
          return true; // CraftBukkit
      }
-@@ -2668,6 +2674,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -2667,6 +2673,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
                  return false;
              }
              // Spigot end
@@ -135,7 +135,7 @@ index cfbca7cc9cfde0a17f13487bde3471445568cbb8..4fc93b94c97a0b9bca7de40d7db8c3f0
              if (this.passengers.size() == 1 && this.passengers.get(0) == entity) {
                  this.passengers = ImmutableList.of();
              } else {
-@@ -4255,4 +4269,41 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -4254,4 +4268,41 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
          return ((ServerChunkCache) level.getChunkSource()).isPositionTicking(this);
      }
      // Paper end
@@ -5717,7 +5717,7 @@ index 0000000000000000000000000000000000000000..8eefb7b7eb33aecf48ac206d3f0139e0
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index d4277ca70124292c6a79f0c01f992f3732e52f02..705fab389cc8efa65432bbcb766e4afd185c0856 100644
+index 0e1dcfdf846f978340380352e092375ffa089cb0..7c51a6113bbf35f96693daf2988b6d59e53cbca1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -1239,4 +1239,27 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {

patches/server/0054-Fix-the-dead-lagging-the-server.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Fix the dead lagging the server
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index c813f28c56b54bd3870cc12e3ecf0ae98545a6b0..176b17217c41801d8b49622ad341f37111941795 100644
+index b6e1424029209064f3698e7a2c326a2b0708bad3..0a1ca98b993a65b3c267e1722bd7846efd4cd6d0 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1764,6 +1764,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -1763,6 +1763,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
          this.setXRot(Mth.clamp(pitch, -90.0F, 90.0F) % 360.0F);
          this.yRotO = this.getYRot();
          this.xRotO = this.getXRot();

patches/server/0066-Configurable-void-damage-height-and-damage.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable void damage height and damage
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 176b17217c41801d8b49622ad341f37111941795..bb33d9e8e54ce17e51fbf10d5b618fb0fe7e29ae 100644
+index 0a1ca98b993a65b3c267e1722bd7846efd4cd6d0..498ffb2aa24e6464f567999a6a941b2cb334e002 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -795,7 +795,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -794,7 +794,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
  
      public void checkOutOfWorld() {
          // Paper start - Configurable nether ceiling damage

patches/server/0067-Add-canSaveToDisk-to-Entity.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add canSaveToDisk to Entity
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index bb33d9e8e54ce17e51fbf10d5b618fb0fe7e29ae..9043422cfa025e98d9c2bb3d9511c8d735d5b476 100644
+index 498ffb2aa24e6464f567999a6a941b2cb334e002..6f8da1602dfe69ac35c98cbe744a25d1dd876a54 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4306,5 +4306,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -4305,5 +4305,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
      public boolean processClick(InteractionHand hand) {
          return false;
      }

patches/server/0073-Item-entity-immunities.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Item entity immunities
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 8596bb86c917acc6ddabf5c2a489103652ad2895..e348f0b0f9cd6e41ad49bb8130748df700230a7f 100644
+index 00bd9c816a62791e892724ebfca08f3cce3645ff..b2eaeb1f36471f9b14a23e54338a2e7168677a80 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -2322,7 +2322,7 @@ Sections go from 0..16. Now whenever a section is not empty, it can potentially
+@@ -2325,7 +2325,7 @@ Sections go from 0..16. Now whenever a section is not empty, it can potentially
  
      public class TrackedEntity {
  

patches/server/0099-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 9043422cfa025e98d9c2bb3d9511c8d735d5b476..ff1592b73dbcf45b6936fe36fe0c3bb17bff198f 100644
+index 6f8da1602dfe69ac35c98cbe744a25d1dd876a54..213d13800d2d8680c2f981cd5850c5a73d0978b1 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3871,11 +3871,17 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -3870,11 +3870,17 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
          this.yRotO = this.getYRot();
      }
  

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

@@ -5,10 +5,10 @@ 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 ff1592b73dbcf45b6936fe36fe0c3bb17bff198f..1c74a0b488048a250b1c2af6974cb8a1e18d7cec 100644
+index 213d13800d2d8680c2f981cd5850c5a73d0978b1..bb167f668bc0b1218327f6ad3bd6b2cbe023d976 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2728,7 +2728,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -2727,7 +2727,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
      public void handleInsidePortal(BlockPos pos) {
          if (this.isOnPortalCooldown()) {
              this.setPortalCooldown();
@@ -17,7 +17,7 @@ index ff1592b73dbcf45b6936fe36fe0c3bb17bff198f..1c74a0b488048a250b1c2af6974cb8a1
              if (!this.level.isClientSide && !pos.equals(this.portalEntrancePos)) {
                  this.portalEntrancePos = pos.immutable();
              }
-@@ -3360,7 +3360,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -3359,7 +3359,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
      }
  
      public boolean canChangeDimensions() {

patches/server/0113-Stonecutter-damage.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Stonecutter damage
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 1c74a0b488048a250b1c2af6974cb8a1e18d7cec..e049dd0e1d068ab80e78fb5989979a266f132eb6 100644
+index bb167f668bc0b1218327f6ad3bd6b2cbe023d976..54442921dd314f22760f158cde662592821ea6de 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1030,7 +1030,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -1029,7 +1029,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
                  }
                  // CraftBukkit end
  

patches/server/0147-Add-MC-4-fix-back.patch

@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Thu, 7 Jan 2021 07:51:25 -0600
-Subject: [PATCH] Add MC-4 fix back
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index e049dd0e1d068ab80e78fb5989979a266f132eb6..307f51ca7a27574c3b5f1bf42bac5a56bdebb949 100644
---- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4076,7 +4076,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
-         // Paper end
-         // Paper start - fix MC-4
-         if (this instanceof ItemEntity) {
--            if (false && com.destroystokyo.paper.PaperConfig.fixEntityPositionDesync) { // Paper - revert
-+            if (com.destroystokyo.paper.PaperConfig.fixEntityPositionDesync) { // Paper - revert // Purpur
-                 // encode/decode from PacketPlayOutEntity
-                 x = Mth.lfloor(x * 4096.0D) * (1 / 4096.0D);
-                 y = Mth.lfloor(y * 4096.0D) * (1 / 4096.0D);

patches/server/0149-Add-EntityTeleportHinderedEvent.patch

@@ -98,7 +98,7 @@ index efdfaf989a1f51759f240d95ef425694b35f5e06..19b162cd4d8fa4f5c996d54800e3859c
          noteBlockIgnoreAbove = getBoolean("gameplay-mechanics.note-block-ignore-above", noteBlockIgnoreAbove);
          persistentTileEntityDisplayNames = getBoolean("gameplay-mechanics.persistent-tileentity-display-names-and-lore", persistentTileEntityDisplayNames);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 705fab389cc8efa65432bbcb766e4afd185c0856..bff5eec5823d0de0fd6bcfaaccab70685ea56081 100644
+index 7c51a6113bbf35f96693daf2988b6d59e53cbca1..9430d4e270cd5ebabeffde0e28f0a96657ce0262 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -561,6 +561,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {

patches/server/0150-Add-StructureGenerateEvent.patch

@@ -19,10 +19,10 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 Co-authored-by: Mariell Hoversholm <proximyst@proximyst.com>
 
 diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
-index 4ed70cc15abd52e8e474d57a3d6be20e94a2f027..a4292e82cdb678d941056e5b059753eb4447b661 100644
+index fde436065aeeb47cd177656a7c9fe8dc34178e87..6a1cb38de5733e384546984a0eadd4bab53c0122 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
-@@ -348,7 +348,14 @@ public abstract class ChunkGenerator {
+@@ -346,7 +346,14 @@ public abstract class ChunkGenerator {
  
          if (structuresettingsfeature != null) {
              StructureStart<?> structurestart1 = feature.generate(registryManager, this, this.biomeSource, structureManager, worldSeed, chunkcoordintpair, biome, j, structuresettingsfeature, chunk);

patches/server/0152-Movement-options-for-armor-stands.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/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 307f51ca7a27574c3b5f1bf42bac5a56bdebb949..bd225cf3e8b8c6ab72134fecdef357b444eb5e68 100644
+index 54442921dd314f22760f158cde662592821ea6de..eae9077653e2fa92fbcba99bc3aca96ef499d20b 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1617,7 +1617,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -1616,7 +1616,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
          return this.isInWater() || flag;
      }
  

patches/server/0153-Fix-stuck-in-portals.patch

@@ -17,10 +17,10 @@ index cefbdb8f5892d5d46ca6ddc8aa6710be42c189a6..4a201004d397cf960822259d4f7d19cf
                  // CraftBukkit end
                  this.setLevel(worldserver);
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index bd225cf3e8b8c6ab72134fecdef357b444eb5e68..6beffbc4769972778477d86ac8a53d26d3b520ae 100644
+index eae9077653e2fa92fbcba99bc3aca96ef499d20b..280059b0edd791c2ac376d611399e7562639410b 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2725,12 +2725,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -2724,12 +2724,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
          return Vec3.directionFromRotation(this.getRotationVector());
      }
  

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

@@ -17,7 +17,7 @@ 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/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index bff5eec5823d0de0fd6bcfaaccab70685ea56081..40640e8ddaa3870e18945a4cc10fe064e3dbe849 100644
+index 9430d4e270cd5ebabeffde0e28f0a96657ce0262..c50089b21d3b258ae4b3f0a6b2625fb129764fee 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -1265,5 +1265,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {

patches/server/0175-Drowning-Settings.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Drowning Settings
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 6beffbc4769972778477d86ac8a53d26d3b520ae..e03f7211d30919764daa53438a0647109b007138 100644
+index 280059b0edd791c2ac376d611399e7562639410b..6db992f8e6bef8ce7ed3f4386640a2324bec249d 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2959,7 +2959,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -2958,7 +2958,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
      }
  
      public int getMaxAirSupply() {

patches/server/0186-Configurable-damage-settings-for-magma-blocks.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable damage settings for magma blocks
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index e03f7211d30919764daa53438a0647109b007138..bd1d12e64a709f63339aaf9725246b68fe198d9d 100644
+index 6db992f8e6bef8ce7ed3f4386640a2324bec249d..90ba2eba2417c9d529a175dbc1228e84588b67b8 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1030,7 +1030,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -1029,7 +1029,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
                  }
                  // CraftBukkit end
  

patches/server/0205-API-for-any-mob-to-burn-daylight.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] API for any mob to burn daylight
 Co-authored by: Encode42 <me@encode42.dev>
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index bd1d12e64a709f63339aaf9725246b68fe198d9d..b31830f3c71f206730b775671aa0b43d87e10629 100644
+index 90ba2eba2417c9d529a175dbc1228e84588b67b8..770e09f47f74d944f178ae2459936f7ef300e8d1 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4319,5 +4319,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -4318,5 +4318,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
      public boolean canSaveToDisk() {
          return true;
      }
@@ -333,7 +333,7 @@ index 1f90c40c5e92232c38a33097903fd6e2f6f2ff02..39fa4a9a52c510e88036ab790a8739d2
          // Paper end
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 40640e8ddaa3870e18945a4cc10fe064e3dbe849..e1e9cca7293483cc4928c96ddd72e616c857b4c9 100644
+index c50089b21d3b258ae4b3f0a6b2625fb129764fee..ce85691da804b62591f65e993206a873e84c1f8c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -1272,5 +1272,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {

patches/server/0210-Add-toggle-for-end-portal-safe-teleporting.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add toggle for end portal safe teleporting
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index b31830f3c71f206730b775671aa0b43d87e10629..4af1929cb5b8959d45d5d72616441f7eba5f9d15 100644
+index 770e09f47f74d944f178ae2459936f7ef300e8d1..e8cc670b6852b1831ce9f76c1531f55cfe9f3215 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2776,7 +2776,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -2775,7 +2775,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
              }
  
              this.processPortalCooldown();

patches/server/0224-Structure-seed-options.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Structure seed options
 
 
 diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
-index a4292e82cdb678d941056e5b059753eb4447b661..5ee7dfda765e3a2f49ee5cd0f4cb7cd5929ac48b 100644
+index 6a1cb38de5733e384546984a0eadd4bab53c0122..3db79ce2ee0e72fe521beaaf6373a5ff0820be69 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
-@@ -426,6 +426,17 @@ public abstract class ChunkGenerator {
+@@ -424,6 +424,17 @@ public abstract class ChunkGenerator {
                      case "village":
                          seed = conf.villageSeed;
                          break;