Merge remote-tracking branch 'upstream/main'

paper-server/patches/features/0016-Fix-entity-tracker-desync-when-new-players-are-added.patch

@@ -60,7 +60,7 @@ index 1463c31ba980ab0eb2174e3e891d1423a505e9dc..886340232b58afd59caa6df29e211589
                  } else if (this.seenBy.remove(player.connection)) {
                      this.serverEntity.removePairing(player);
 diff --git a/net/minecraft/server/level/ServerEntity.java b/net/minecraft/server/level/ServerEntity.java
-index 0005a1784ccaa00e5d6d67e7be98445150487982..257ecbcf7d463eefb951867a5426eaf24e356305 100644
+index a1ae77b70f69852d9e4332bf1cb3409c33b21de0..b118e91f1e0b5a8b8c0b2a4a32faabc5a34a5954 100644
 --- a/net/minecraft/server/level/ServerEntity.java
 +++ b/net/minecraft/server/level/ServerEntity.java
 @@ -103,6 +103,13 @@ public class ServerEntity {
@@ -77,7 +77,7 @@ index 0005a1784ccaa00e5d6d67e7be98445150487982..257ecbcf7d463eefb951867a5426eaf2
      public void sendChanges() {
          // Paper start - optimise collisions
          if (((ca.spottedleaf.moonrise.patches.chunk_system.entity.ChunkSystemEntity)this.entity).moonrise$isHardColliding()) {
-@@ -136,7 +143,7 @@ public class ServerEntity {
+@@ -141,7 +148,7 @@ public class ServerEntity {
              this.sendDirtyEntityData();
          }
  
@@ -86,7 +86,7 @@ index 0005a1784ccaa00e5d6d67e7be98445150487982..257ecbcf7d463eefb951867a5426eaf2
              byte b = Mth.packDegrees(this.entity.getYRot());
              byte b1 = Mth.packDegrees(this.entity.getXRot());
              boolean flag = Math.abs(b - this.lastSentYRot) >= 1 || Math.abs(b1 - this.lastSentXRot) >= 1;
-@@ -171,7 +178,7 @@ public class ServerEntity {
+@@ -176,7 +183,7 @@ public class ServerEntity {
                  long l1 = this.positionCodec.encodeY(vec3);
                  long l2 = this.positionCodec.encodeZ(vec3);
                  boolean flag5 = l < -32768L || l > 32767L || l1 < -32768L || l1 > 32767L || l2 < -32768L || l2 > 32767L;
@@ -95,7 +95,7 @@ index 0005a1784ccaa00e5d6d67e7be98445150487982..257ecbcf7d463eefb951867a5426eaf2
                      this.wasOnGround = this.entity.onGround();
                      this.teleportDelay = 0;
                      packet = ClientboundEntityPositionSyncPacket.of(this.entity);
-@@ -236,6 +243,7 @@ public class ServerEntity {
+@@ -241,6 +248,7 @@ public class ServerEntity {
              }
  
              this.entity.hasImpulse = false;

paper-server/patches/sources/net/minecraft/server/level/ServerEntity.java.patch

@@ -28,7 +28,15 @@
          this.level = level;
          this.broadcast = broadcast;
          this.entity = entity;
-@@ -106,13 +_,14 @@
+@@ -103,16 +_,22 @@
+         if (!passengers.equals(this.lastPassengers)) {
+             List<UUID> list = this.mountedOrDismounted(passengers).map(Entity::getUUID).toList();
+             this.broadcastWithIgnore.accept(new ClientboundSetPassengersPacket(this.entity), list);
++            // Paper start - Allow riding players
++            if (this.entity instanceof ServerPlayer player) {
++                player.connection.send(new ClientboundSetPassengersPacket(this.entity));
++            }
++            // Paper end - Allow riding players
              this.lastPassengers = passengers;
          }
  

paper-server/patches/sources/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch

@@ -1237,14 +1237,21 @@
                          } else {
                              Component component1 = Component.translatable("build.tooHigh", maxY).withStyle(ChatFormatting.RED);
                              this.player.sendSystemMessage(component1, true);
-@@ -1268,6 +_,7 @@
+@@ -1268,13 +_,7 @@
  
                          this.player.connection.send(new ClientboundBlockUpdatePacket(serverLevel, blockPos));
                          this.player.connection.send(new ClientboundBlockUpdatePacket(serverLevel, blockPos.relative(direction)));
+-                    } else {
+-                        LOGGER.warn(
+-                            "Rejecting UseItemOnPacket from {}: Location {} too far away from hit block {}.",
+-                            this.player.getGameProfile().getName(),
+-                            location,
+-                            blockPos
+-                        );
 +                        if (io.papermc.paper.configuration.GlobalConfiguration.get().unsupportedSettings.updateEquipmentOnPlayerActions) this.player.detectEquipmentUpdates(); // Paper - Force update attributes.
-                     } else {
-                         LOGGER.warn(
-                             "Rejecting UseItemOnPacket from {}: Location {} too far away from hit block {}.",
+                     }
+                 }
+             }
 @@ -1284,6 +_,8 @@
      @Override
      public void handleUseItem(ServerboundUseItemPacket packet) {

paper-server/patches/sources/net/minecraft/world/level/portal/PortalShape.java.patch

@@ -122,7 +122,7 @@
              }
 +            // CraftBukkit start - left and right
 +            blocks.setBlock(checkPos.set(pos).move(Direction.UP, i).move(direction, -1), level.getBlockState(checkPos), 18);
-+            blocks.setBlock(checkPos.set(pos).move(Direction.UP, i).move(direction, i), level.getBlockState(checkPos), 18);
++            blocks.setBlock(checkPos.set(pos).move(Direction.UP, i).move(direction, width), level.getBlockState(checkPos), 18); // Paper - fix block list
 +            // CraftBukkit end
          }