Updated Upstream (Paper & Tuinity)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@0aa3cc7 Suppress deprecation registration warnings for brigadier events (#6297)
PaperMC/Paper@81a7559 Correct handling of invalid maps (#6302)

Tuinity Changes:
Tuinity/Tuinity@5620c57 Use Velocity compression and cipher natives (#351)
Tuinity/Tuinity@3be4fc5 [CI-SKIP] Redirect to CI when clicking CI badge in README (#344)

gradle.properties

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

patches/server/0002-Rebrand.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Rebrand
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index b7e5bdcfe04ab7d8d8d453a787849963640262a5..cdae64a1f8a4096865fbaa246a0715f909cf5043 100644
+index 66f5e6edc2bac290664c534df213058eaeab3b4e..0f87b2104253705608e402e28b8b262ae2181206 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -34,8 +34,8 @@ repositories {
+@@ -35,8 +35,8 @@ repositories {
  }
 
  dependencies {
@@ -19,15 +19,15 @@ index b7e5bdcfe04ab7d8d8d453a787849963640262a5..cdae64a1f8a4096865fbaa246a0715f9
  // Paper start
  implementation("org.jline:jline-terminal-jansi:3.12.1")
  implementation("net.minecrell:terminalconsoleappender:1.2.0")
-@@ -66,6 +66,7 @@ dependencies {
+@@ -67,6 +67,7 @@ dependencies {
 
  implementation("co.aikar:cleaner:1.0-SNAPSHOT") // Paper
  implementation("io.netty:netty-all:4.1.65.Final") // Paper
 + implementation("cat.inspiracio:rhino-js-engine:1.7.7.1") // Purpur
 
  implementation("org.quiltmc:tiny-mappings-parser:0.3.0") // Paper - needed to read mappings for stacktrace deobfuscation
-
-@@ -86,7 +87,7 @@ tasks.jar {
+  implementation("com.velocitypowered:velocity-native:1.1.0-SNAPSHOT") // Tuinity
+@@ -88,7 +89,7 @@ tasks.jar {
  attributes(
  "Main-Class" to "org.bukkit.craftbukkit.Main",
  "Implementation-Title" to "CraftBukkit",

patches/server/0064-Add-player-death-exp-control-options.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add player death exp control options
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index d6b610a848f37db24af9b219be2f22aeaf892388..52d43c2bf1fa1bfa97aab02a9837c6b11ecafc9d 100644
+index d761865eabfc67651b0a2a92ad35fc236886b61d..3e04510519ca5d03eb16aab8b1094e24101cebf4 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -1905,9 +1905,18 @@ public abstract class Player extends LivingEntity {
+@@ -1907,9 +1907,18 @@ public abstract class Player extends LivingEntity {
  @Override
  protected int getExperienceReward(Player player) {
  if (!this.level.getGameRules().getBoolean(GameRules.RULE_KEEPINVENTORY) && !this.isSpectator()) {

patches/server/0125-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add critical hit check to EntityDamagedByEntityEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 52d43c2bf1fa1bfa97aab02a9837c6b11ecafc9d..d57a1984328750f5a6db748ef2db21fb3e2dff00 100644
+index 3e04510519ca5d03eb16aab8b1094e24101cebf4..12a3304c3b465f2a9d7cf279ea7b945bb3b8f6a1 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -182,6 +182,7 @@ public abstract class Player extends LivingEntity {
@@ -16,15 +16,15 @@ index 52d43c2bf1fa1bfa97aab02a9837c6b11ecafc9d..d57a1984328750f5a6db748ef2db21fb
 
  // CraftBukkit start
  public boolean fauxSleeping;
-@@ -1241,6 +1242,7 @@ public abstract class Player extends LivingEntity {
+@@ -1243,6 +1244,7 @@ public abstract class Player extends LivingEntity {
  flag2 = flag2 && !level.paperConfig.disablePlayerCrits; // Paper
  flag2 = flag2 && !this.isSprinting();
  if (flag2) {
 + this.isCritical = true; // Purpur
  f *= 1.5F;
  }
 
-@@ -1277,6 +1279,7 @@ public abstract class Player extends LivingEntity {
+@@ -1279,6 +1281,7 @@ public abstract class Player extends LivingEntity {
 
  Vec3 vec3d = target.getDeltaMovement();
  boolean flag5 = target.hurt(DamageSource.playerAttack(this), f);

patches/server/0200-Add-config-change-multiplier-critical-damage-value.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add config change multiplier critical damage value
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 656b62c93dcbe15a79ebe684c18f4dc31ddc0dbe..5963b407d936e930a370677113ba947d2c2a198d 100644
+index 51e0701385c94822f83e8b628967ef9d36a10085..ace974dd50765602aa234cb7be9151714f072f5a 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -1253,7 +1253,7 @@ public abstract class Player extends LivingEntity {
+@@ -1255,7 +1255,7 @@ public abstract class Player extends LivingEntity {
  flag2 = flag2 && !this.isSprinting();
  if (flag2) {
  this.isCritical = true; // Purpur

patches/server/0202-Config-for-unverified-username-message.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Config for unverified username message
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 45e77d96f673ce68cf15ce3d45fd1eeffed4d8d8..811b48e0b91e2af30a122b72803591e48519e6a9 100644
+index 9ab220ef0d20151d4e205f3edc213fd9353601ad..2ac8770beec518df79ad3f9324e78b03b72c24d6 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-@@ -304,7 +304,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener
+@@ -306,7 +306,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener
  ServerLoginPacketListenerImpl.this.gameProfile = ServerLoginPacketListenerImpl.this.createFakeProfile(gameprofile);
  ServerLoginPacketListenerImpl.this.state = ServerLoginPacketListenerImpl.State.READY_TO_ACCEPT;
  } else {

patches/server/0207-Fix-advancement-triggers-on-entity-death.patch

@@ -139,10 +139,10 @@ index c9a44a4765f43b9c0247ed1005f4c13469bdee95..6d08c8c31a32ea38f06410fbaddf19b9
  public boolean canTakeItem(ItemStack stack) {
  net.minecraft.world.entity.EquipmentSlot enumitemslot = Mob.getEquipmentSlotForItem(stack);
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 5963b407d936e930a370677113ba947d2c2a198d..b60e38add38ac58d01f419dcb1b07a9b79bf1cb8 100644
+index ace974dd50765602aa234cb7be9151714f072f5a..24523dd712329f2f3abe40bb3f1801ef7946e831 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -1989,6 +1989,52 @@ public abstract class Player extends LivingEntity {
+@@ -1991,6 +1991,52 @@ public abstract class Player extends LivingEntity {
 
  }
 

patches/server/0212-Flying-Fall-Damage-API.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Flying Fall Damage API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index b60e38add38ac58d01f419dcb1b07a9b79bf1cb8..e2b2ee49f9b8220c2de3f26389e78b6321c60d33 100644
+index 24523dd712329f2f3abe40bb3f1801ef7946e831..ebd744b08e27d6fc6dda31ada7ad8bb1864a6982 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -183,6 +183,7 @@ public abstract class Player extends LivingEntity {
@@ -16,7 +16,7 @@ index b60e38add38ac58d01f419dcb1b07a9b79bf1cb8..e2b2ee49f9b8220c2de3f26389e78b63
 
  // CraftBukkit start
  public boolean fauxSleeping;
-@@ -1728,7 +1729,7 @@ public abstract class Player extends LivingEntity {
+@@ -1730,7 +1731,7 @@ public abstract class Player extends LivingEntity {
 
  @Override
  public boolean causeFallDamage(float fallDistance, float damageMultiplier, DamageSource damageSource) {

patches/server/0214-Burp-after-eating-food-fills-hunger-bar-completely.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Burp after eating food fills hunger bar completely
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index e2b2ee49f9b8220c2de3f26389e78b6321c60d33..79782538277b60a1c1c16c1c75b53b7d8a2c00ee 100644
+index ebd744b08e27d6fc6dda31ada7ad8bb1864a6982..bae254bd927cf1715a98c55354941c2341f69694 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -196,6 +196,8 @@ public abstract class Player extends LivingEntity {
@@ -30,7 +30,7 @@ index e2b2ee49f9b8220c2de3f26389e78b6321c60d33..79782538277b60a1c1c16c1c75b53b7d
  this.noPhysics = this.isSpectator();
  if (this.isSpectator()) {
  this.onGround = false;
-@@ -2343,7 +2351,7 @@ public abstract class Player extends LivingEntity {
+@@ -2345,7 +2353,7 @@ public abstract class Player extends LivingEntity {
  public ItemStack eat(Level world, ItemStack stack) {
  this.getFoodData().eat(stack.getItem(), stack);
  this.awardStat(Stats.ITEM_USED.get(stack.getItem()));

patches/server/0234-Player-ridable-in-water-option.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Player ridable in water option
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 2064f93074a58c116352ee768ef9ad9663004641..e90193b303ecafc1073d22ff0e145a6fef42c4ce 100644
+index 8d62bbb4fb818bea940bbac565cb8e30cb85818e..4d7e9a0d59ca2e3d9df1a7e47637bdbd6bf26809 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -2060,6 +2060,11 @@ public abstract class Player extends LivingEntity {
+@@ -2062,6 +2062,11 @@ public abstract class Player extends LivingEntity {
  return this.inventory.armor;
  }