Updated Upstream (Bukkit/CraftBukkit/Spigot) (#7246)

Author: Machine-Maker

patches/api/0353-Remove-upstream-snakeyaml-fix.patch

@@ -0,0 +1,32 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <jake.m.potrebic@gmail.com>
+Date: Wed, 5 Jan 2022 12:12:58 -0800
+Subject: [PATCH] Remove upstream snakeyaml fix
+
+See Server Patch: Fix saving configs with more long comments
+
+diff --git a/src/main/java/org/bukkit/configuration/file/YamlConfiguration.java b/src/main/java/org/bukkit/configuration/file/YamlConfiguration.java
+index df250bf41463c57b3ec7c288e134460a2295eed5..2159e7a49ed1bc01533e67ac9f6917801ec963e3 100644
+--- a/src/main/java/org/bukkit/configuration/file/YamlConfiguration.java
++++ b/src/main/java/org/bukkit/configuration/file/YamlConfiguration.java
+@@ -65,7 +65,7 @@ public class YamlConfiguration extends FileConfiguration {
+         yamlLoaderOptions = new LoaderOptions();
+         yamlLoaderOptions.setMaxAliasesForCollections(Integer.MAX_VALUE); // SPIGOT-5881: Not ideal, but was default pre SnakeYAML 1.26
+ 
+-        yaml = new BukkitYaml(constructor, representer, yamlDumperOptions, yamlLoaderOptions);
++        yaml = new /*BukkitYaml*/Yaml(constructor, representer, yamlDumperOptions, yamlLoaderOptions); // Paper - don't use upstream BukkitYaml fix, add the whole snakeyaml Emitter class itself with the fix
+     }
+ 
+     @NotNull
+diff --git a/src/test/java/org/bukkit/configuration/file/YamlConfigurationTest.java b/src/test/java/org/bukkit/configuration/file/YamlConfigurationTest.java
+index a0ff42abd3ced3513ee3343e14d5068cc5dd4532..9dd844fde37fe47b51cd30092e86b5b41a2344ef 100644
+--- a/src/test/java/org/bukkit/configuration/file/YamlConfigurationTest.java
++++ b/src/test/java/org/bukkit/configuration/file/YamlConfigurationTest.java
+@@ -146,6 +146,7 @@ public class YamlConfigurationTest extends FileConfigurationTest {
+     }
+ 
+     @Test
++    @org.junit.Ignore // Paper - ignore test because our fix doesn't work in testing environment
+     public void test100Comments() throws InvalidConfigurationException {
+         StringBuilder commentBuilder = new StringBuilder();
+         for (int i = 0; i < 100; i++) {

patches/server/0010-Timings-v2.patch

@@ -1041,7 +1041,7 @@ index 4dd57007af218ba1c0e666117a49939c5884f2c6..a6cb949b6f048455acc50c897fdd93d3
      }
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index f3a2a5dcd18d8abe370779f75106eacab498c3b6..67113f1bb622acde89c05d1ee0af88644f67e776 100644
+index ae93a5bd184e084720400a44a3d9b14910343333..d2f59b13121f1d105837e0a52be4aca5d110c15c 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -1,8 +1,10 @@
@@ -1217,7 +1217,7 @@ index be11caf7c0dcdb11e24cfb053cda45ac1867da63..8f5e9f1bdfd2e02512e1341f91b147b1
      }
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index ce9ff034a281cd9cc76c26713b6d1eab3f6c9fe2..ae090f58bec25270e55f8da37355351783e69a7f 100644
+index 073cea951644f25c276ba05ff1fc48fda08593da..c7fe4b6aa8d68bd5dc394752a5ae635eb46c5f31 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1,6 +1,8 @@
@@ -1412,7 +1412,7 @@ index 8e4325abb2dda74c38b17bb27f9dcfcf97ba2de6..1be4b3ad18d314b0460ce61e01afd0d7
 
      public UserWhiteList getWhiteList() {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index fdf607c91ee31206839b14212a20ee81ec751776..3eb1f5e422002a48651a24d0e70884bf54de717e 100644
+index efb347d1a8ac45b13e1abfa712cbd204c64501ae..668fcdf95c92b439612d98f224ae4ac9bd055bdf 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -125,7 +125,6 @@ import org.bukkit.craftbukkit.event.CraftPortalEvent;
@@ -1424,7 +1424,7 @@ index fdf607c91ee31206839b14212a20ee81ec751776..3eb1f5e422002a48651a24d0e70884bf
  import org.bukkit.event.hanging.HangingBreakByEntityEvent;
  import org.bukkit.event.vehicle.VehicleBlockCollisionEvent;
 @@ -286,7 +285,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
-     public boolean forceExplosionKnockback; // SPIGOT-949
+     public boolean lastDamageCancelled; // SPIGOT-5339, SPIGOT-6252, SPIGOT-6777: Keep track if the event was canceled
      public boolean persistentInvisibility = false;
      public BlockPos lastLavaContact;
 -    public CustomTimingsHandler tickTimer = org.bukkit.craftbukkit.SpigotTimings.getEntityTimings(this); // Spigot
@@ -1504,7 +1504,7 @@ index e688949fc2f3031dc9c9817bc59554e9f5a436af..20cfdba68c200e87d00995a6a4e25a5f
      }
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index e9e97cf0b202c84252fb3bada97890198fcc6bb9..2a65e7ae49f2fc1d56cdace60f72b729c1d9b28c 100644
+index 5669d868f764dcdea8c510fc902cadea226ce473..46b40b08916369f8aa8b28144f07c48741c45101 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -137,7 +137,7 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@@ -1516,15 +1516,15 @@ index e9e97cf0b202c84252fb3bada97890198fcc6bb9..2a65e7ae49f2fc1d56cdace60f72b729
 
  public abstract class LivingEntity extends Entity {
 
-@@ -2761,7 +2761,6 @@ public abstract class LivingEntity extends Entity {
+@@ -2760,7 +2760,6 @@ public abstract class LivingEntity extends Entity {
 
      @Override
      public void tick() {
 -        SpigotTimings.timerEntityBaseTick.startTiming(); // Spigot
          super.tick();
          this.updatingUsingItem();
          this.updateSwimAmount();
-@@ -2802,9 +2801,7 @@ public abstract class LivingEntity extends Entity {
+@@ -2801,9 +2800,7 @@ public abstract class LivingEntity extends Entity {
              }
          }
 
@@ -1534,7 +1534,7 @@ index e9e97cf0b202c84252fb3bada97890198fcc6bb9..2a65e7ae49f2fc1d56cdace60f72b729
          double d0 = this.getX() - this.xo;
          double d1 = this.getZ() - this.zo;
          float f = (float) (d0 * d0 + d1 * d1);
-@@ -2884,8 +2881,6 @@ public abstract class LivingEntity extends Entity {
+@@ -2883,8 +2880,6 @@ public abstract class LivingEntity extends Entity {
          if (this.isSleeping()) {
              this.setXRot(0.0F);
          }
@@ -1543,23 +1543,23 @@ index e9e97cf0b202c84252fb3bada97890198fcc6bb9..2a65e7ae49f2fc1d56cdace60f72b729
      }
 
      public void detectEquipmentUpdates() {
-@@ -3067,7 +3062,6 @@ public abstract class LivingEntity extends Entity {
+@@ -3066,7 +3061,6 @@ public abstract class LivingEntity extends Entity {
 
          this.setDeltaMovement(d4, d5, d6);
          this.level.getProfiler().push("ai");
 -        SpigotTimings.timerEntityAI.startTiming(); // Spigot
          if (this.isImmobile()) {
              this.jumping = false;
              this.xxa = 0.0F;
-@@ -3077,7 +3071,6 @@ public abstract class LivingEntity extends Entity {
+@@ -3076,7 +3070,6 @@ public abstract class LivingEntity extends Entity {
              this.serverAiStep();
              this.level.getProfiler().pop();
          }
 -        SpigotTimings.timerEntityAI.stopTiming(); // Spigot
 
          this.level.getProfiler().pop();
          this.level.getProfiler().push("jump");
-@@ -3112,9 +3105,9 @@ public abstract class LivingEntity extends Entity {
+@@ -3111,9 +3104,9 @@ public abstract class LivingEntity extends Entity {
          this.updateFallFlying();
          AABB axisalignedbb = this.getBoundingBox();
 
@@ -1571,7 +1571,7 @@ index e9e97cf0b202c84252fb3bada97890198fcc6bb9..2a65e7ae49f2fc1d56cdace60f72b729
          this.level.getProfiler().pop();
          this.level.getProfiler().push("freezing");
          boolean flag1 = this.getType().is(EntityTypeTags.FREEZE_HURTS_EXTRA_TYPES);
-@@ -3143,9 +3136,7 @@ public abstract class LivingEntity extends Entity {
+@@ -3142,9 +3135,7 @@ public abstract class LivingEntity extends Entity {
              this.checkAutoSpinAttack(axisalignedbb, this.getBoundingBox());
          }
 
@@ -2145,10 +2145,10 @@ index 8cb510615bc8b4638b4aadfd9732c9a3d65b1fac..e0ba1608d83c6007717df3323b916a92
       * This helper class represents the different NBT Tags.
       * <p>
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index 67f4ebf30d752fdc595fc847d695d8dad0e805d8..af66bb6b3733eaf722838de8b9f45396ffddc2f3 100644
+index a7675df12d509ae0ff585566b395165f55f8a8cf..38cf408899cef72bc9d2888109a7ac7ce0aec638 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
-@@ -28,7 +28,7 @@ import net.minecraft.world.entity.projectile.ThrownTrident;
+@@ -27,7 +27,7 @@ import net.minecraft.world.entity.projectile.ThrownTrident;
  import net.minecraft.world.entity.raid.Raider;
  import net.minecraft.world.level.Level;
  import net.minecraft.world.phys.AABB;
@@ -2157,7 +2157,7 @@ index 67f4ebf30d752fdc595fc847d695d8dad0e805d8..af66bb6b3733eaf722838de8b9f45396
 
  public class ActivationRange
  {
-@@ -72,8 +72,8 @@ public class ActivationRange
+@@ -71,8 +71,8 @@ public class ActivationRange
      /**
       * These entities are excluded from Activation range checks.
       *
@@ -2168,7 +2168,7 @@ index 67f4ebf30d752fdc595fc847d695d8dad0e805d8..af66bb6b3733eaf722838de8b9f45396
       * @return boolean If it should always tick.
       */
      public static boolean initializeEntityActivationState(Entity entity, SpigotWorldConfig config)
-@@ -108,7 +108,7 @@ public class ActivationRange
+@@ -107,7 +107,7 @@ public class ActivationRange
       */
      public static void activateEntities(Level world)
      {
@@ -2177,7 +2177,7 @@ index 67f4ebf30d752fdc595fc847d695d8dad0e805d8..af66bb6b3733eaf722838de8b9f45396
          final int miscActivationRange = world.spigotConfig.miscActivationRange;
          final int raiderActivationRange = world.spigotConfig.raiderActivationRange;
          final int animalActivationRange = world.spigotConfig.animalActivationRange;
-@@ -131,7 +131,7 @@ public class ActivationRange
+@@ -134,7 +134,7 @@ public class ActivationRange
 
              world.getEntities().get(maxBB, ActivationRange::activateEntity);
          }
@@ -2186,7 +2186,7 @@ index 67f4ebf30d752fdc595fc847d695d8dad0e805d8..af66bb6b3733eaf722838de8b9f45396
      }
 
      /**
-@@ -226,10 +226,8 @@ public class ActivationRange
+@@ -229,10 +229,8 @@ public class ActivationRange
       */
      public static boolean checkIfActive(Entity entity)
      {
@@ -2197,7 +2197,7 @@ index 67f4ebf30d752fdc595fc847d695d8dad0e805d8..af66bb6b3733eaf722838de8b9f45396
              return true;
          }
 
-@@ -253,7 +251,6 @@ public class ActivationRange
+@@ -256,7 +254,6 @@ public class ActivationRange
          {
              isActive = false;
          }

patches/server/0031-Always-tick-falling-blocks.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Always tick falling blocks
 
 
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index af66bb6b3733eaf722838de8b9f45396ffddc2f3..c3b7b1bc978eb0d40587682795e86b82981aed82 100644
+index 38cf408899cef72bc9d2888109a7ac7ce0aec638..07e5ece37af6b02210920ce6cc31738274d447a9 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
-@@ -90,6 +90,7 @@ public class ActivationRange
+@@ -89,6 +89,7 @@ public class ActivationRange
                  || entity instanceof AbstractHurtingProjectile
                  || entity instanceof LightningBolt
                  || entity instanceof PrimedTnt

patches/server/0033-Fix-lag-from-explosions-processing-dead-entities.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Fix lag from explosions processing dead entities
 
 
 diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
-index a0e364c3f6d5c513c8b37de60ced9ef6433b6cda..996e02be9f3150ba125d52e3d544599c2b8dd968 100644
+index d2060ba62bebafce409e5ac64868abc5a5f98bcc..047864651dfbf009b66706e5cb0dd3d1749424bc 100644
 --- a/src/main/java/net/minecraft/world/level/Explosion.java
 +++ b/src/main/java/net/minecraft/world/level/Explosion.java
-@@ -207,7 +207,7 @@ public class Explosion {
+@@ -208,7 +208,7 @@ public class Explosion {
          int i1 = Mth.floor(this.y + (double) f2 + 1.0D);
          int j1 = Mth.floor(this.z - (double) f2 - 1.0D);
          int k1 = Mth.floor(this.z + (double) f2 + 1.0D);

patches/server/0034-Optimize-explosions.patch

@@ -37,10 +37,10 @@ index b86ceda8f7376334987955095234bdecec5af414..9d6daeba112e68c64c2b5d7d0c771776
 
          this.profiler.popPush("connection");
 diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
-index 996e02be9f3150ba125d52e3d544599c2b8dd968..688ebb68209beb4550293f72b1fa7b39852be453 100644
+index 047864651dfbf009b66706e5cb0dd3d1749424bc..a901ce351c484820a8ca95889125e561023d9b31 100644
 --- a/src/main/java/net/minecraft/world/level/Explosion.java
 +++ b/src/main/java/net/minecraft/world/level/Explosion.java
-@@ -226,7 +226,7 @@ public class Explosion {
+@@ -227,7 +227,7 @@ public class Explosion {
                          d8 /= d11;
                          d9 /= d11;
                          d10 /= d11;
@@ -49,7 +49,7 @@ index 996e02be9f3150ba125d52e3d544599c2b8dd968..688ebb68209beb4550293f72b1fa7b39
                          double d13 = (1.0D - d7) * d12;
 
                          // CraftBukkit start
-@@ -444,4 +444,84 @@ public class Explosion {
+@@ -465,4 +465,84 @@ public class Explosion {
 
          private BlockInteraction() {}
      }
@@ -135,7 +135,7 @@ index 996e02be9f3150ba125d52e3d544599c2b8dd968..688ebb68209beb4550293f72b1fa7b39
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 8a2d18524e089cdc07125e424b37f1b629e591a6..4c049a41035824a9affdf25495a658a0c58dcd75 100644
+index cb115128ac988dc4b58f452532644dd8fcf37d4c..16f212b4005469dc99fdd83ed6e5810a5b6f8abf 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -156,6 +156,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {

patches/server/0035-Disable-explosion-knockback.patch

@@ -19,26 +19,26 @@ index 2b0a75dc2e292e655ca3300f64bc1211b3adeceb..5cae4a5caf9aba8c0e99f1cb6badc5e8
 +    }
  }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 906c23068d1f5be76a6985b7255f6f155335b673..deef28110441cd2965c6b531bc255ee2aa994ace 100644
+index 46b40b08916369f8aa8b28144f07c48741c45101..7365ff9a52ddc302a68002a48c60ce526fcd547b 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -1375,6 +1375,7 @@ public abstract class LivingEntity extends Entity {
+@@ -1374,6 +1374,7 @@ public abstract class LivingEntity extends Entity {
                  }
              }
 
 +            boolean knockbackCancelled = level.paperConfig.disableExplosionKnockback && source.isExplosion() && this instanceof net.minecraft.world.entity.player.Player; // Paper - Disable explosion knockback
              if (flag1) {
                  if (flag) {
                      this.level.broadcastEntityEvent(this, (byte) 29);
-@@ -1395,6 +1396,7 @@ public abstract class LivingEntity extends Entity {
+@@ -1394,6 +1395,7 @@ public abstract class LivingEntity extends Entity {
                          b0 = 2;
                      }
 
 +                    if (!knockbackCancelled) // Paper - Disable explosion knockback
                      this.level.broadcastEntityEvent(this, b0);
                  }
 
-@@ -1418,6 +1420,7 @@ public abstract class LivingEntity extends Entity {
+@@ -1417,6 +1419,7 @@ public abstract class LivingEntity extends Entity {
                  }
              }
 
@@ -47,10 +47,10 @@ index 906c23068d1f5be76a6985b7255f6f155335b673..deef28110441cd2965c6b531bc255ee2
                  if (!this.checkTotemDeathProtection(source)) {
                      SoundEvent soundeffect = this.getDeathSound();
 diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
-index 688ebb68209beb4550293f72b1fa7b39852be453..32c8403d6a5f5fbd52679b12b07936147744b8a4 100644
+index a901ce351c484820a8ca95889125e561023d9b31..09f17a7f4f78b09a44a6486923060623478a2b5e 100644
 --- a/src/main/java/net/minecraft/world/level/Explosion.java
 +++ b/src/main/java/net/minecraft/world/level/Explosion.java
-@@ -241,14 +241,14 @@ public class Explosion {
+@@ -262,14 +262,14 @@ public class Explosion {
                          double d14 = d13;
 
                          if (entity instanceof LivingEntity) {

patches/server/0068-Custom-replacement-for-eaten-items.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Custom replacement for eaten items
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 09cea6b92aa8a0b60716163b7bda61823268bed7..76da306041b61f6c93e6f58f580054af7dfc234e 100644
+index c4bfeffbfefcb77c7727cb8466eb20c8ca0f2956..cb611587ad1b929627576a330e398d980595c48a 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3564,9 +3564,10 @@ public abstract class LivingEntity extends Entity {
+@@ -3563,9 +3563,10 @@ public abstract class LivingEntity extends Entity {
                      this.triggerItemUseEffects(this.useItem, 16);
                      // CraftBukkit start - fire PlayerItemConsumeEvent
                      ItemStack itemstack;
@@ -20,7 +20,7 @@ index 09cea6b92aa8a0b60716163b7bda61823268bed7..76da306041b61f6c93e6f58f580054af
                          level.getCraftServer().getPluginManager().callEvent(event);
 
                          if (event.isCancelled()) {
-@@ -3580,6 +3581,13 @@ public abstract class LivingEntity extends Entity {
+@@ -3579,6 +3580,13 @@ public abstract class LivingEntity extends Entity {
                      } else {
                          itemstack = this.useItem.finishUsingItem(this.level, this);
                      }
@@ -34,7 +34,7 @@ index 09cea6b92aa8a0b60716163b7bda61823268bed7..76da306041b61f6c93e6f58f580054af
                      // CraftBukkit end
 
                      if (itemstack != this.useItem) {
-@@ -3587,6 +3595,11 @@ public abstract class LivingEntity extends Entity {
+@@ -3586,6 +3594,11 @@ public abstract class LivingEntity extends Entity {
                      }
 
                      this.stopUsingItem();