Updates

patches/server/0002-Airplane-Branding-Changes.patch

@@ -20,10 +20,10 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index f442236efe30d7d9e0c6a8dfb0f040540dc62753..7eb93902e22374644aa615f49cfbb01b052b5b40 100644
+index c236fe5dc388f8bc0a929f1de04af94c63514208..795912e0ab7ce6db3025a0e1c8754a7030a80224 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -22,8 +22,8 @@ repositories {
+@@ -13,8 +13,8 @@ plugins {
  }
 
  dependencies {
@@ -34,15 +34,15 @@ index f442236efe30d7d9e0c6a8dfb0f040540dc62753..7eb93902e22374644aa615f49cfbb01b
      // Paper start
      implementation("org.jline:jline-terminal-jansi:3.21.0")
      implementation("net.minecrell:terminalconsoleappender:1.3.0")
-@@ -76,6 +76,7 @@ tasks.jar {
+@@ -67,6 +67,7 @@ tasks.jar {
              "Main-Class" to "org.bukkit.craftbukkit.Main",
              "Implementation-Title" to "CraftBukkit",
              "Implementation-Version" to "git-Paper-$implementationVersion",
 +            "Implementation-Version" to "git-Airplane-$implementationVersion", // Airplane
              "Implementation-Vendor" to date, // Paper
              "Specification-Title" to "Bukkit",
              "Specification-Version" to project.version,
-@@ -134,6 +135,22 @@ relocation {
+@@ -125,6 +126,22 @@ relocation {
      }
  }
 
@@ -231,7 +231,7 @@ index 0000000000000000000000000000000000000000..e79ec7919e6cf160fec1cb981d85f0f3
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 5a4172faaf960d48939d6a485719041987df9242..159b9073a7f8da7993f228643a5a35bb6f66d05e 100644
+index 8091a901106a1085da9dfd8627dadcbe50f00872..8149b0b14c25ab73f98e0c08dcc3a947a481d840 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1729,7 +1729,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa

patches/server/0004-Airplane-Configuration.patch

@@ -22,10 +22,10 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 7eb93902e22374644aa615f49cfbb01b052b5b40..5a7947cf5ab437eb5d62f8c73796e837e134d6c3 100644
+index 795912e0ab7ce6db3025a0e1c8754a7030a80224..82766ba700b38fc76c8204f9037b309f56152abc 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -58,6 +58,12 @@ dependencies {
+@@ -49,6 +49,12 @@ dependencies {
      implementation("net.fabricmc:mapping-io:0.3.0") // Paper - needed to read mappings for stacktrace deobfuscation
      implementation("com.velocitypowered:velocity-native:1.1.0-SNAPSHOT") // Paper
 
@@ -53,7 +53,7 @@ index e29b0a90019b12bd6586ad0f7b5314f307e527ba..6e8001c7ff6497c9e5c274a5fe85cc20
 
          new TimingsExport(listeners, parent, history).start();
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index def26111f1461a54209d34f5063e65c5eb3b48e5..6cda37d340bfc6f76cbb3bdaa3ffb6d3cf90da9f 100644
+index 028626f0d2807a0534ac5053358fcfda0c82a909..7c61ae257323c7f0a0b2e43f64fb540c22c47104 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -220,10 +220,11 @@ public class PaperConfig {

patches/server/0013-Airplane-Profiler.patch

@@ -20,10 +20,10 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 6cf00a3764710b31c3c61134dfe1435e66d7a035..0517c09379f9893e5b6e2dc38027b28bacc287f0 100644
+index 82766ba700b38fc76c8204f9037b309f56152abc..99ec8f39c2cde70525752a79b8d71af1669fefd0 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -63,6 +63,7 @@ dependencies {
+@@ -54,6 +54,7 @@ dependencies {
      implementation ("me.carleslc.Simple-YAML:Simple-Yaml:1.7.2") { // Airplane - more config
          exclude(group="org.yaml", module="snakeyaml") // exclude snakeyaml dependency because its old (1.26)
      } // Airplane - more config

patches/server/0038-Sentry-Logging-Support.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Sentry Logging Support
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 0517c09379f9893e5b6e2dc38027b28bacc287f0..a8d405700f885cd6eed9132d5c6f89754ab9f47e 100644
+index 99ec8f39c2cde70525752a79b8d71af1669fefd0..408b85c21f8330e3f955237317706a46e0a5a81d 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -65,6 +65,8 @@ dependencies {
+@@ -56,6 +56,8 @@ dependencies {
      } // Airplane - more config
      implementation("com.github.technove:Flare:34637f3f87") // Airplane - flare
 

patches/server/0040-Optimize-Passive.patch

@@ -52,7 +52,7 @@ index d697aa2b18e13026a9377e990d966e7dcf924fb9..37d4a01008f58ee8d3df6f38d3d0a7b8
              if (!AirplaneConfig.dearEnabled) {
                  changes.add("dab.enabled §7|§f§o Change to §a§lTRUE");
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ab42a69bdf3adb1bef9165e2eec0fee6c3ca46d9..518de03b7f4e4b7c0db48102d6f66376ef6fcd6c 100644
+index d1b41bcd4120e39621f67dc7f431d883612d3e50..2d2c4e2a6666d14c8e9cfaedc5af94f6106a3951 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -288,6 +288,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -82,7 +82,7 @@ index ab42a69bdf3adb1bef9165e2eec0fee6c3ca46d9..518de03b7f4e4b7c0db48102d6f66376
 
                      if (i > 5000L && this.nextTickTime - this.lastOverloadWarning >= 30000L) { // CraftBukkit
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index df12ba04df24e1c70c43e00283ea2a78ae2ca422..f2007f21ddae5402ffef59d33cab1bc50c7b300f 100644
+index 0ed010c44d3994d17df57c17e38bd9ac2dfd3442..635525254e53e2f7e17c33c56f467de8f040f4eb 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -20,6 +20,8 @@ import java.util.Random;
@@ -125,7 +125,7 @@ index df12ba04df24e1c70c43e00283ea2a78ae2ca422..f2007f21ddae5402ffef59d33cab1bc5
 
      @Override
      public float getBukkitYaw() {
-@@ -2863,6 +2873,9 @@ public abstract class LivingEntity extends Entity {
+@@ -2885,6 +2895,9 @@ public abstract class LivingEntity extends Entity {
 
      @Override
      public void tick() {
@@ -135,7 +135,7 @@ index df12ba04df24e1c70c43e00283ea2a78ae2ca422..f2007f21ddae5402ffef59d33cab1bc5
          super.tick();
          this.updatingUsingItem();
          this.updateSwimAmount();
-@@ -3176,9 +3189,33 @@ public abstract class LivingEntity extends Entity {
+@@ -3198,9 +3211,33 @@ public abstract class LivingEntity extends Entity {
              this.xxa = 0.0F;
              this.zza = 0.0F;
          } else if (this.isEffectiveAi()) {

patches/server/0041-Optimize-Collisions.patch

@@ -91,7 +91,7 @@ index 2cad495e834300cdd3ee65cdf43d28ae602c9625..db0105566db7ab5f3bd937a334acf224
                          this.push(-d0, 0.0D, -d1);
                      }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index f2007f21ddae5402ffef59d33cab1bc50c7b300f..060cc83d35fb047a4ce5d2f9554827ea917f313d 100644
+index 635525254e53e2f7e17c33c56f467de8f040f4eb..85c39890f8851a272bffc01f89bb696e9196ba17 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -104,10 +104,7 @@ import net.minecraft.world.item.alchemy.PotionUtils;
@@ -106,7 +106,7 @@ index f2007f21ddae5402ffef59d33cab1bc50c7b300f..060cc83d35fb047a4ce5d2f9554827ea
  import net.minecraft.world.level.block.AbstractSkullBlock;
  import net.minecraft.world.level.block.BedBlock;
  import net.minecraft.world.level.block.Blocks;
-@@ -3284,7 +3281,18 @@ public abstract class LivingEntity extends Entity {
+@@ -3306,7 +3303,18 @@ public abstract class LivingEntity extends Entity {
              this.checkAutoSpinAttack(axisalignedbb, this.getBoundingBox());
          }
 
@@ -127,7 +127,7 @@ index f2007f21ddae5402ffef59d33cab1bc50c7b300f..060cc83d35fb047a4ce5d2f9554827ea
          // Paper start
          if (((ServerLevel) this.level).hasEntityMoveEvent && !(this instanceof net.minecraft.world.entity.player.Player)) {
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index f66894df2902a1f1bba1dd69a3c3ee229fbe13f6..bfb910a511521f5ab16ea4e0000cb054f4bc6b73 100644
+index 7bd53805a6016c2bcf958fdc6a7fd1f5f3e1f6d7..1353a36698b15020f1b1d067d405382ad66368a9 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -219,6 +219,14 @@ public abstract class Level implements LevelAccessor, AutoCloseable {

patches/server/0042-Entity-Tracking.patch

@@ -116,7 +116,7 @@ index c958a00535c0f7a015a7a566b97e2c80fc9a0efd..5d785c65a881e10efdb6050617835873
                      // Paper end
                  } else {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 518de03b7f4e4b7c0db48102d6f66376ef6fcd6c..95d1295775bd25517e9f823d7460b58af9f81208 100644
+index 2d2c4e2a6666d14c8e9cfaedc5af94f6106a3951..5609e4a8208b157d24bebdbcf5c2b8c1ee3e2a97 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -48,6 +48,7 @@ import java.util.Random;
@@ -353,7 +353,7 @@ index a453aac607f9b38f0bf90038ff2d8071687c4bae..546cedd234bb6b3e093ef4ea6d06c0c6
 
                  if (event.isCancelled()) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 7c8eaf0e23b24a484a21b6c4a732b488b246b5b9..66cb818d745c4a0a84795a06d4635233c4f2cbaf 100644
+index f7eb3bf48d4fb5b3bd4308482cedf35cf279e278..807bbde533987b5a4d0b967c26b2cf323a4a90a3 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2407,29 +2407,33 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -407,7 +407,7 @@ index 7c8eaf0e23b24a484a21b6c4a732b488b246b5b9..66cb818d745c4a0a84795a06d4635233
              // Spigot end
              // Spigot Start
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 060cc83d35fb047a4ce5d2f9554827ea917f313d..13916dc638ce830c8f0573ab8326584b8401cc75 100644
+index 85c39890f8851a272bffc01f89bb696e9196ba17..2042ce6a83e0a5d4bf3871f28d05f5e59a831b2d 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -133,6 +133,7 @@ import java.util.ArrayList;
@@ -418,7 +418,7 @@ index 060cc83d35fb047a4ce5d2f9554827ea917f313d..13916dc638ce830c8f0573ab8326584b
  import org.bukkit.Location;
  import org.bukkit.craftbukkit.attribute.CraftAttributeMap;
  import org.bukkit.craftbukkit.event.CraftEventFactory;
-@@ -3035,7 +3036,7 @@ public abstract class LivingEntity extends Entity {
+@@ -3057,7 +3058,7 @@ public abstract class LivingEntity extends Entity {
                  if (this instanceof ServerPlayer && enumitemslot.getType() == EquipmentSlot.Type.ARMOR) {
                      final org.bukkit.inventory.ItemStack oldItem = CraftItemStack.asBukkitCopy(itemstack);
                      final org.bukkit.inventory.ItemStack newItem = CraftItemStack.asBukkitCopy(itemstack1);

patches/server/0043-Iron-Golems.patch

@@ -144,7 +144,7 @@ index 0bd800e1aeda87689a6c56ee6fadda381c74a4ff..99ce2332f88e08e894018a11e97380d0
      public boolean isInvulnerable() {
          return this.getHandle().isInvulnerableTo(DamageSource.GENERIC);
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index aaf47d3f58819ead3553973c159c5c6eec4abe43..78d4d7108e1ac32a4e0e9420979c67699450c411 100644
+index ea01507f96d81c6fbcfeb65902017bbc332de650..34c5637ef486ec91253d71f5d7fb989d3f14e82e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -12,6 +12,8 @@ import java.util.List;
@@ -168,8 +168,7 @@ index aaf47d3f58819ead3553973c159c5c6eec4abe43..78d4d7108e1ac32a4e0e9420979c6769
  import net.minecraft.world.entity.boss.enderdragon.EnderDragon;
  import net.minecraft.world.entity.item.ItemEntity;
  import net.minecraft.world.entity.monster.Ghast;
-@@ -875,10 +874,15 @@ public class CraftEventFactory {
-         // Paper end
+@@ -876,10 +875,15 @@ public class CraftEventFactory {
          victim.expToDrop = event.getDroppedExp();
          lootCheck.run(); // Paper - run advancement triggers before destroying the equipment stacks below
 

patches/server/0050-Entity-Damage-Ticks.patch

@@ -55,7 +55,7 @@ index 7d77829b46d4d6c44b2cf980b93b3ae867102615..930291428fcf0d72c6a5371eab031edb
              if (!AirplaneConfig.dearEnabled) {
                  changes.add("dab.enabled §7|§f§o Change to §a§lTRUE");
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 13916dc638ce830c8f0573ab8326584b8401cc75..4a94a02c43fd04cf302bce94a3bf06561cd6457c 100644
+index 2042ce6a83e0a5d4bf3871f28d05f5e59a831b2d..bc53b0623089ecaae53d75e0f19831a4c1c9a5cd 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -92,6 +92,7 @@ import net.minecraft.world.entity.monster.Monster;
@@ -99,7 +99,7 @@ index 13916dc638ce830c8f0573ab8326584b8401cc75..4a94a02c43fd04cf302bce94a3bf0656
                  // this.damageEntity0(damagesource, f);
                  // CraftBukkit end
                  this.hurtDuration = 10;
-@@ -2385,14 +2401,15 @@ public abstract class LivingEntity extends Entity {
+@@ -2407,14 +2423,15 @@ public abstract class LivingEntity extends Entity {
      }
 
      private void makePoofParticles() {

patches/server/0051-Optimize-Entity-Ticking.patch

@@ -124,7 +124,7 @@ index 930291428fcf0d72c6a5371eab031edb34b37c73..3e2cfb2fce5c2bf3eeee275fb6172325
              if (!AirplaneConfig.dearEnabled) {
                  changes.add("dab.enabled §7|§f§o Change to §a§lTRUE");
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 66cb818d745c4a0a84795a06d4635233c4f2cbaf..f318f961e02d8dfc96be8311a33707997dbe58b7 100644
+index 807bbde533987b5a4d0b967c26b2cf323a4a90a3..6a808bfa28faac097dc8e28b41fff6416dc6758a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -4,6 +4,7 @@ import com.google.common.annotations.VisibleForTesting;
@@ -336,7 +336,7 @@ index 90ee71d3a05427068f26992814bf8d4dcc51ef8d..f090d03bbbc8be50ad16ad798eb41609
              }
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 4a94a02c43fd04cf302bce94a3bf06561cd6457c..6cf117086e5b0b04341814b22809a9a7a17f5aaf 100644
+index bc53b0623089ecaae53d75e0f19831a4c1c9a5cd..81f06aae3abb4da750490714b0904c771cedabd2 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -401,17 +401,19 @@ public abstract class LivingEntity extends Entity {
@@ -439,7 +439,7 @@ index 4a94a02c43fd04cf302bce94a3bf06561cd6457c..6cf117086e5b0b04341814b22809a9a7
                  }
              }
          }
-@@ -4292,4 +4296,12 @@ public abstract class LivingEntity extends Entity {
+@@ -4314,4 +4318,12 @@ public abstract class LivingEntity extends Entity {
          this.absMoveTo(d0, d1, d2, f, f1);
          this.setDeltaMovement((double) ((float) packet.getXd() / 8000.0F), (double) ((float) packet.getYd() / 8000.0F), (double) ((float) packet.getZd() / 8000.0F));
      }
@@ -453,7 +453,7 @@ index 4a94a02c43fd04cf302bce94a3bf06561cd6457c..6cf117086e5b0b04341814b22809a9a7
 +
  }
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 5bda57e44c0ba27ec1623b593cc80d760cdb1637..340c604a27810e30364275364c5687140ca6a6c9 100644
+index 81838f8f5aa04a8898d9544b8606d10bb49e5481..d90473f763971101881fc4c08d963194bee3e443 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -627,6 +627,11 @@ public abstract class Mob extends LivingEntity {
@@ -584,7 +584,7 @@ index 05dcd51c561f9fedf4ee5891a378b0ba7d66d2c4..33f69da297a4139ba8fe8e56f22c341a
 
      public boolean blockActionRestricted(Level world, BlockPos pos, GameType gameMode) {
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index bfb910a511521f5ab16ea4e0000cb054f4bc6b73..f2e6d457bf9d4450dc1e46fa51749ce90f483e57 100644
+index 1353a36698b15020f1b1d067d405382ad66368a9..638f55032cff2c33623a8a21ab1e8f405f5eb961 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -16,6 +16,8 @@ import java.util.function.Consumer;

patches/server/0069-Update-Branding.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Update Branding
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 3823eaa2facbe9cb1dfaa81801e3686228a53909..59e97550e54c2acb9a122903531e027a8701bc3c 100644
+index 408b85c21f8330e3f955237317706a46e0a5a81d..5b5c706ea48901d5545e65b4b3830def9d283a61 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -22,7 +22,7 @@ repositories {
+@@ -13,7 +13,7 @@ plugins {
  }
 
  dependencies {