Update upstream

DRE2N · Jul 10, 2024 · ca1ad34 · ca1ad34
1 parent 6d3645b
commit ca1ad34
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 46 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -3,7 +3,7 @@ group=de.erethon.papyrus
 version = 1.21-R0.1-SNAPSHOT
 mcVersion = 1.21
 
-paperCommit = dd49fba8c534d48c3693a751075ecb5836a9d458
+paperCommit = 20889d04d8c7a11ff76061d99abcb58acd470fe7
 
 org.gradle.jvmargs=-Xmx8G
 org.gradle.caching=true

diff --git a/patches/api/0002-fixup-javadoc.patch b/patches/api/0002-fixup-javadoc.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] fixup javadoc
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index fd39ed209b20c927054b8482c400beeeeab460a3..ff78d9570bc5d9b953472fb727c27146a25e0da7 100644
+index da8386fdc0e474cacf109136546055e06ceb857e..5a66fc1cd215e51f819bf58e61891c4f4aace3bf 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -6,7 +6,7 @@ plugins {
@@ -17,7 +17,7 @@ index fd39ed209b20c927054b8482c400beeeeab460a3..ff78d9570bc5d9b953472fb727c27146
  }
 
  val annotationsVersion = "24.1.0"
-@@ -175,6 +175,7 @@ tasks.withType<Javadoc> {
+@@ -176,6 +176,7 @@ tasks.withType<Javadoc> {
              "sourcepath",
              apiAndDocs.resolvedConfiguration.files.joinToString(separator = File.pathSeparator, transform = File::getPath)
          )

diff --git a/patches/api/0003-Spellbook.patch b/patches/api/0003-Spellbook.patch
@@ -2006,7 +2006,7 @@ index 0000000000000000000000000000000000000000..8b72dba1a152833a89730155ff166328
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index bbc4d7d3ca84642828f9a3f788ca26bba900d15b..ac6cfea766cd220f7cc297e94059ff7a799b29b5 100644
+index c043d239c449bf4bb13a24467f2f6c67b4d28d2d..cc63d331028f6d1218d778e8d43e7bcf6e358b32 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -14,6 +14,7 @@ import java.util.Set;
@@ -2017,7 +2017,7 @@ index bbc4d7d3ca84642828f9a3f788ca26bba900d15b..ac6cfea766cd220f7cc297e94059ff7a
  import org.bukkit.Warning.WarningState;
  import org.bukkit.advancement.Advancement;
  import org.bukkit.block.data.BlockData;
-@@ -2540,4 +2541,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2543,4 +2544,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      boolean isOwnedByCurrentRegion(@NotNull Entity entity);
      // Paper end - Folia region threading API

diff --git a/patches/server/0001-Branding-changes.patch b/patches/server/0001-Branding-changes.patch
@@ -48,10 +48,10 @@ index 1a734293c9416f13324bb0edf8f950c9029f8bc4..a26ff240bb68379f00f3e1ec5e058c3b
              "Git-Commit" to gitHash, // Paper
              "CraftBukkit-Package-Version" to paperweight.craftBukkitPackageVersion.get(), // Paper
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 68f60e77e0bfd42b6419491c1d59b6432974216b..467ff9fd732f077ecf85f858f3c81b4a48b3a5a3 100644
+index 330bee331335454a61cf8350a6654217c8124445..009f641503b5bfdbcce5676be5b27d3097500bcd 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1869,7 +1869,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1932,7 +1932,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
 
      @DontObfuscate
      public String getServerModName() {

diff --git a/patches/server/0002-misc-qol.patch b/patches/server/0002-misc-qol.patch
@@ -189,7 +189,7 @@ index 90a2c61c42cba7e38f167eccdd7a951a947963c4..6abe17797036c86115d17f87c4f2da17
          if (connected && (InnerUtil.canSendImmediate(this, packet)
              || (io.papermc.paper.util.MCUtil.isMainThread() && packet.isReady() && this.pendingActions.isEmpty()
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 89ed20e9c629cf39a24c7a0ce5c4fee41fc64fd5..e3361d32c9e39afd040f30bbf3febbedad734b86 100644
+index 9d1e68c09fa7093cf0f6fa636f90cb15a44cbb38..3b6945e58b157c89d99fff020003a5b4e67b9e0b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -6,29 +6,11 @@ import com.mojang.datafixers.util.Either;
@@ -380,7 +380,7 @@ index 89ed20e9c629cf39a24c7a0ce5c4fee41fc64fd5..e3361d32c9e39afd040f30bbf3febbed
      public ServerPlayer(MinecraftServer server, ServerLevel world, GameProfile profile, ClientInformation clientOptions) {
          super(world, world.getSharedSpawnPos(), world.getSharedSpawnAngle(), profile);
          this.chatVisibility = ChatVisiblity.FULL;
-@@ -2936,3 +2863,4 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
+@@ -2945,3 +2872,4 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
      }
      // CraftBukkit end
  }

diff --git a/patches/server/0003-combat-changes.patch b/patches/server/0003-combat-changes.patch
@@ -63,7 +63,7 @@ index 0000000000000000000000000000000000000000..afe4ed93f622cc46c0bb1faa12976e44
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index e3361d32c9e39afd040f30bbf3febbedad734b86..759d425533ea4e8534f04f96e19a2ce7779a79d8 100644
+index 3b6945e58b157c89d99fff020003a5b4e67b9e0b..2199ca8112057ecfe32c6301988093b83c13b13b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -6,6 +6,7 @@ import com.mojang.datafixers.util.Either;
@@ -74,7 +74,7 @@ index e3361d32c9e39afd040f30bbf3febbedad734b86..759d425533ea4e8534f04f96e19a2ce7
  import io.papermc.paper.adventure.PaperAdventure;
  import net.minecraft.*;
  import net.minecraft.advancements.CriteriaTriggers;
-@@ -2340,7 +2341,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
+@@ -2342,7 +2343,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
          if (this.gameMode.getGameModeForPlayer() == GameType.SPECTATOR) {
              this.setCamera(target);
          } else {
@@ -96,7 +96,7 @@ index 7796e191747be545e744564a2b0b65790f69114d..47fa5fb1884ee33f03f875951442a27d
 
      // CraftBukkit start - add fields and methods
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 2519c08a45ce3febcf51ac308ad98ac0e2657cf3..caa98e46b02698c4b21256d5266a1e198f1e897c 100644
+index 83f3ffdd8fa901b3de580d2359cdb5ead0d762cb..5212cfad27b6f7dd715dbf69008e6366e031b3da 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -10,6 +10,7 @@ import it.unimi.dsi.fastutil.doubles.DoubleList;
@@ -107,7 +107,7 @@ index 2519c08a45ce3febcf51ac308ad98ac0e2657cf3..caa98e46b02698c4b21256d5266a1e19
  import it.unimi.dsi.fastutil.objects.Object2DoubleArrayMap;
  import it.unimi.dsi.fastutil.objects.Object2DoubleMap;
  import java.util.ArrayList;
-@@ -2142,6 +2143,16 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -2143,6 +2144,16 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          }
      }
 
@@ -160,7 +160,7 @@ index da56b9704ce486f4c5956cc044a73b10fd2db140..4930eef744cdb9f1855502a3186235cf
      public Attributes() {}
 
 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 54ba25632c2a9e1c93a5b3a0b92e5280864c49d6..9f0b9b51e36b96f935a96df92754afdf929dab9b 100644
+index 09bcbc0ae36e4e69fee87a7e0c49acf496117a39..9e1c0d47dec605309e3ad8a680793665945138f3 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -7,16 +7,8 @@ import com.mojang.authlib.GameProfile;
@@ -245,7 +245,7 @@ index 54ba25632c2a9e1c93a5b3a0b92e5280864c49d6..9f0b9b51e36b96f935a96df92754afdf
  import org.bukkit.craftbukkit.entity.CraftHumanEntity;
  import org.bukkit.craftbukkit.event.CraftEventFactory;
  import org.bukkit.craftbukkit.util.CraftVector;
-@@ -125,6 +94,11 @@ import org.bukkit.event.entity.EntityKnockbackEvent;
+@@ -126,6 +95,11 @@ import org.bukkit.event.entity.EntityKnockbackEvent;
  import org.bukkit.event.entity.EntityRemoveEvent;
  import org.bukkit.event.player.PlayerDropItemEvent;
  import org.bukkit.event.player.PlayerVelocityEvent;
@@ -257,7 +257,7 @@ index 54ba25632c2a9e1c93a5b3a0b92e5280864c49d6..9f0b9b51e36b96f935a96df92754afdf
  // CraftBukkit end
 
  public abstract class Player extends LivingEntity {
-@@ -132,7 +106,7 @@ public abstract class Player extends LivingEntity {
+@@ -133,7 +107,7 @@ public abstract class Player extends LivingEntity {
      private static final Logger LOGGER = LogUtils.getLogger();
      public static final HumanoidArm DEFAULT_MAIN_HAND = HumanoidArm.RIGHT;
      public static final int DEFAULT_MODEL_CUSTOMIZATION = 0;
@@ -266,7 +266,7 @@ index 54ba25632c2a9e1c93a5b3a0b92e5280864c49d6..9f0b9b51e36b96f935a96df92754afdf
      public static final int SLEEP_DURATION = 100;
      public static final int WAKE_UP_DURATION = 10;
      public static final int ENDER_SLOT_OFFSET = 200;
-@@ -1264,6 +1238,15 @@ public abstract class Player extends LivingEntity {
+@@ -1265,6 +1239,15 @@ public abstract class Player extends LivingEntity {
          return this.level().noCollision(this, new AABB(axisalignedbb.minX + offsetX, axisalignedbb.minY - (double) f - 9.999999747378752E-6D, axisalignedbb.minZ + offsetZ, axisalignedbb.maxX + offsetX, axisalignedbb.minY, axisalignedbb.maxZ + offsetZ));
      }
 
@@ -282,7 +282,7 @@ index 54ba25632c2a9e1c93a5b3a0b92e5280864c49d6..9f0b9b51e36b96f935a96df92754afdf
      public void attack(Entity target) {
          // Paper start - PlayerAttackEntityEvent
          boolean willAttack = target.isAttackable() && !target.skipAttackInteraction(this); // Vanilla logic
-@@ -1500,7 +1483,7 @@ public abstract class Player extends LivingEntity {
+@@ -1503,7 +1486,7 @@ public abstract class Player extends LivingEntity {
 
      @Override
      protected void doAutoAttackOnTouch(LivingEntity target) {
@@ -292,7 +292,7 @@ index 54ba25632c2a9e1c93a5b3a0b92e5280864c49d6..9f0b9b51e36b96f935a96df92754afdf
 
      @io.papermc.paper.annotation.DoNotUse @Deprecated // Paper - Add PlayerShieldDisableEvent
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 7eea190ce8a62960ecc42ff56a4ef71b754184fb..972f935699bdda6af68f7a2664dbf5d19be2254c 100644
+index d01b45a48d412e3cb591acee101730704574448a..72ae63e23229c62ee72b248dde1f82710b22d931 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -204,8 +204,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {