[ci skip] Move back more

patches/server/1033-Expand-scoreboard-tag-count-validation-to-API-set.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Expand scoreboard tag count validation to API set
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 1b547be0fe97119edf4f29666cfe0037e0c778e0..7ac7d0729705cb02f22277be3c467aed4f69ec0e 100644
+index 9865fb52bcee1dd4dd068e69e45cd85fbcbe9060..4105223beb716408deb27a27bb87aa6ee27eec72 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -586,7 +586,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -477,7 +477,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          this.packetPositionCodec = new VecDeltaCodec();
          this.uuid = Mth.createInsecureUUID(this.random);
          this.stringUUID = this.uuid.toString();
@@ -17,7 +17,7 @@ index 1b547be0fe97119edf4f29666cfe0037e0c778e0..7ac7d0729705cb02f22277be3c467aed
          this.pistonDeltas = new double[]{0.0D, 0.0D, 0.0D};
          this.mainSupportingBlockPos = Optional.empty();
          this.onGroundNoBlocks = false;
-@@ -677,7 +677,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -568,7 +568,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      }
  
      public boolean addTag(String tag) {

patches/server/1034-Fix-incorrect-command-serialization-by-creating-new-.patch

@@ -11,10 +11,10 @@ This is fixed by creating a different no-op command for the
 erasure, instead of them holding the same lambda.
 
 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index 64bf4444ffba25cb40743a32267aa790ad1738f9..517cb238ec280aadd1fc54bcb675ed386e798eaf 100644
+index 56d6bbd37556f11a603aa3c8647217cc9a2dc5da..2e4dbcbfd002909da89b4e7d070ac2325b452a08 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
-@@ -587,9 +587,14 @@ public class Commands {
+@@ -586,9 +586,14 @@ public class Commands {
                      return true;
                  });
                  if (argumentbuilder.getCommand() != null) {

patches/server/1035-Properly-resend-entities.patch

@@ -134,7 +134,7 @@ index af209a95b3f83e9c2c3f6473e3be7ca4414ebf40..eb9783d22d13d2dbf204d2ce953e17e1
  
      }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 9865fb52bcee1dd4dd068e69e45cd85fbcbe9060..8ac4fe3f94baa47f1b95d9f8a6a84fad2504e573 100644
+index 4105223beb716408deb27a27bb87aa6ee27eec72..761829bbb81d2d70b2f8ae8b23f3ec4065f5fbdd 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -598,13 +598,45 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

patches/server/1036-Switch-Impl-types-to-Holderable.patch

@@ -294,7 +294,7 @@ index 6532bdaf6cbd10ecc5ace1b89899ad82e7bca206..8f2276fcd20d2ececbda3ad1460e78ae
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaMusicInstrument.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaMusicInstrument.java
-index a80b9b142ca99c7c0257b1bdeb059dce5f92ae93..9ae6bdc4412c466fb53abb3722e9a9533df6f888 100644
+index 8423c6b67a83d99ef4356674f64d6e52fda3d36f..e6c4a08c9199c7f45effc33e818ac3d9023ab7bc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaMusicInstrument.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaMusicInstrument.java
 @@ -37,7 +37,7 @@ public class CraftMetaMusicInstrument extends CraftMetaItem implements MusicInst

patches/server/1042-Entity-Activation-Range-2.0.patch

@@ -87,7 +87,7 @@ index b98b8d42fb95185551a4559ce22abad33e000d33..5d6f135f3d1b845e289d20d566e1b544
  
              }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 8ac4fe3f94baa47f1b95d9f8a6a84fad2504e573..c85e0cc09d7dfe9221665c13211d381b07f10a54 100644
+index 761829bbb81d2d70b2f8ae8b23f3ec4065f5fbdd..34b68e4caec0a5f4ee4b0d9373b1615cf30019e4 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -421,6 +421,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

patches/server/1045-Optimize-Collision-to-not-load-chunks.patch

@@ -14,7 +14,7 @@ movement will load only the chunk the player enters anyways and avoids loading
 massive amounts of surrounding chunks due to large AABB lookups.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index c85e0cc09d7dfe9221665c13211d381b07f10a54..7496260370adc6f627288637c53a652d27a6cd84 100644
+index 34b68e4caec0a5f4ee4b0d9373b1615cf30019e4..766031d1482b0f49b196326b820d5ce9ae1c7c06 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -259,6 +259,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

patches/server/1052-Fix-entity-type-tags-suggestions-in-selectors.patch

@@ -35,7 +35,7 @@ index 3549ffea451b932602efb113844ba21a7bc72371..13bd145b1e8006a53c22f5dc0c78f29b
 +    // Paper end - tell clients to ask server for suggestions for EntityArguments
  }
 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index 56d6bbd37556f11a603aa3c8647217cc9a2dc5da..64bf4444ffba25cb40743a32267aa790ad1738f9 100644
+index 2e4dbcbfd002909da89b4e7d070ac2325b452a08..517cb238ec280aadd1fc54bcb675ed386e798eaf 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
 @@ -534,6 +534,7 @@ public class Commands {
@@ -46,7 +46,7 @@ index 56d6bbd37556f11a603aa3c8647217cc9a2dc5da..64bf4444ffba25cb40743a32267aa790
          while (iterator.hasNext()) {
              CommandNode<CommandSourceStack> commandnode2 = (CommandNode) iterator.next();
              // Paper start - Brigadier API
-@@ -596,6 +597,12 @@ public class Commands {
+@@ -601,6 +602,12 @@ public class Commands {
  
                      if (requiredargumentbuilder.getSuggestionsProvider() != null) {
                          requiredargumentbuilder.suggests(SuggestionProviders.safelySwap(requiredargumentbuilder.getSuggestionsProvider()));

patches/server/1058-Moonrise-optimisation-patches.patch

@@ -28416,7 +28416,7 @@ index 50040c497a819cd1229042ab3cb057d34a32cacc..1f9c436a632e4f110be61cf76fcfc3b7
 +    // Paper end - block counting
  }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 7496260370adc6f627288637c53a652d27a6cd84..d08a9a8618be72b418d849846a5a433250f5b73d 100644
+index 766031d1482b0f49b196326b820d5ce9ae1c7c06..1f54752a4ea0788e73279cd99c7c35e3b5d9b6ce 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -176,7 +176,7 @@ import org.bukkit.event.player.PlayerTeleportEvent;

patches/server/1061-Detail-more-information-in-watchdog-dumps.patch

@@ -121,7 +121,7 @@ index cf692267c6376ed8484478dc90f4f905d8325618..3295843371d56fa76eb8d7a29efb6757
  
      private void tickPassenger(Entity vehicle, Entity passenger, boolean isActive) { // Paper - EAR 2
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index d08a9a8618be72b418d849846a5a433250f5b73d..1b547be0fe97119edf4f29666cfe0037e0c778e0 100644
+index 1f54752a4ea0788e73279cd99c7c35e3b5d9b6ce..7ac7d0729705cb02f22277be3c467aed4f69ec0e 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1144,8 +1144,43 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess