Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@b097a24 Expose isUnderWater to Entity (#8454)
PaperMC/Paper@6b26cfc Add missing Entity + Projectile API (#7632)
PaperMC/Paper@de2d2d4 Add PlayerInventorySlotChangeEvent (#7321)
PaperMC/Paper@f7c8d79 Fix stacktrace in server tests
PaperMC/Paper@b9cf1ac Fix a classloading issue in tests (#8459)
PaperMC/Paper@7fe34e9 Make CraftMinecartTNT public
PaperMC/Paper@514a606 Elder Guardian appearance API (#8455)
PaperMC/Paper@2094011 Update settings directory path in exceptions (#7968)
PaperMC/Paper@0bdf997 Avoid cycle deprecation (#8466)
PaperMC/Paper@eb68bd4 Allow changing bed's 'occupied' property (#8458)

gradle.properties

@@ -1,7 +1,7 @@
 group = org.purpurmc.purpur
 version = 1.19.2-R0.1-SNAPSHOT
 
-paperCommit = 57555b8c6afc87542b26559e40381b4f0ba508bd
+paperCommit = eb68bd49a24fa6b0296b023b71489afcd4590fda
 
 org.gradle.caching = true
 org.gradle.parallel = true

patches/api/0005-Purpur-client-support.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Purpur client support
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 1d98abff1ad0116f7a2599f078aa730cb84843c1..a74aee455dffa6eb3a90ac12b9933eb3f0d5a4fc 100644
+index ecb8b4cf48c7d6151ffec92bc6855d1fc57a2b51..6355c9390238775b324b9f4e6795e40495ad3529 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2832,4 +2832,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2850,4 +2850,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      @Override
      Spigot spigot();
      // Spigot end

patches/api/0007-Ridables.patch

@@ -22,10 +22,10 @@ index 8fd399f791b45eb7fc62693ca954eea0c68e2881..22705359d5b3b1af522ff5575c07ca5e
       * @deprecated removed in 1.16
       */
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 6dd81f07ef4d6993187987d3352a01771ffb715e..20b00b0c12b848c171fa43d53ce53428e0f424a6 100644
+index 33a6b7a27dc91552799c07a7aad9b3df31ad13f7..83c74245e75b8895404fe4b7214c686a308e00b5 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -946,4 +946,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -951,4 +951,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
       */
      boolean wouldCollideUsing(@NotNull BoundingBox boundingBox);
      // Paper End - Collision API

patches/api/0009-Llama-API.patch

@@ -5,24 +5,15 @@ Subject: [PATCH] Llama API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Llama.java b/src/main/java/org/bukkit/entity/Llama.java
-index d23226ccb0f6c25028f000ce31346cd0a8898e6a..1ef9479c962b3f4f6fed46671a1209c34040d16d 100644
+index bc84b892cae5fe7019a3ad481e9da79956efa1fe..48eb5b00c460cccde29d327cef1d63fc04d6a829 100644
 --- a/src/main/java/org/bukkit/entity/Llama.java
 +++ b/src/main/java/org/bukkit/entity/Llama.java
-@@ -3,6 +3,7 @@ package org.bukkit.entity;
- import com.destroystokyo.paper.entity.RangedEntity;
- import org.bukkit.inventory.LlamaInventory;
- import org.jetbrains.annotations.NotNull;
-+import org.jetbrains.annotations.Nullable; // Purpur
-
- /**
-  * Represents a Llama.
-@@ -67,4 +68,65 @@ public interface Llama extends ChestedHorse, RangedEntity { // Paper
-     @NotNull
-     @Override
-     LlamaInventory getInventory();
+@@ -119,4 +119,20 @@ public interface Llama extends ChestedHorse, RangedEntity { // Paper
+     @org.jetbrains.annotations.Nullable
+     Llama getCaravanTail();
+     // Paper end
 +
 +    // Purpur start
-+
 +    /**
 +     * Check if this Llama should attempt to join a caravan
 +     *
@@ -36,50 +27,6 @@ index d23226ccb0f6c25028f000ce31346cd0a8898e6a..1ef9479c962b3f4f6fed46671a1209c3
 +     * @param shouldJoinCaravan True to allow joining a caravan
 +     */
 +    void setShouldJoinCaravan(boolean shouldJoinCaravan);
-+
-+    /**
-+     * Check if Llama is in a caravan
-+     *
-+     * @return True if in caravan
-+     */
-+    boolean inCaravan();
-+
-+    /**
-+     * Join a caravan
-+     *
-+     * @param llama Head of caravan to join
-+     */
-+    void joinCaravan(@NotNull Llama llama);
-+
-+    /**
-+     * Leave current caravan if in one
-+     */
-+    void leaveCaravan();
-+
-+    /**
-+     * Check if another Llama is following this Llama
-+     *
-+     * @return True if being followed in the caravan
-+     */
-+    boolean hasCaravanTail();
-+
-+    /**
-+     * Get the Llama that this Llama is following
-+     * <p>
-+     * Does not necessarily mean the leader of the entire caravan
-+     *
-+     * @return The Llama being followed
-+     */
-+    @Nullable
-+    Llama getCaravanHead();
-+
-+    /**
-+     * Get the Llama following this Llama, if any
-+     *
-+     * @return The Llama following this one
-+     */
-+    @Nullable
-+    Llama getCaravanTail();
 +    // Purpur end
  }
 diff --git a/src/main/java/org/purpurmc/purpur/event/entity/LlamaJoinCaravanEvent.java b/src/main/java/org/purpurmc/purpur/event/entity/LlamaJoinCaravanEvent.java

patches/api/0010-AFK-API.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] AFK API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index a74aee455dffa6eb3a90ac12b9933eb3f0d5a4fc..64f42f8eb62a475c7407be2f461fc0d10ea014e9 100644
+index 6355c9390238775b324b9f4e6795e40495ad3529..a0a108154d64a9ffd89b7ccfb692235a81637dd4 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2840,5 +2840,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2858,5 +2858,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @return True if Player uses Purpur Client
       */
      public boolean usesPurpurClient();

patches/api/0017-Player-invulnerabilities.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Player invulnerabilities
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 64f42f8eb62a475c7407be2f461fc0d10ea014e9..f569064325dceed352b3ab993add415526b93950 100644
+index a0a108154d64a9ffd89b7ccfb692235a81637dd4..b4f6f2ee270ce7bfb2e63727244ca7def5fdfcb9 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2859,5 +2859,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2877,5 +2877,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * Reset the idle timer back to 0
       */
      void resetIdleTimer();

patches/api/0034-API-for-any-mob-to-burn-daylight.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] API for any mob to burn daylight
 Co-authored by: Encode42 <me@encode42.dev>
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 20b00b0c12b848c171fa43d53ce53428e0f424a6..be7ad89699619aba9df4699403c9a70fd2bc9da1 100644
+index 83c74245e75b8895404fe4b7214c686a308e00b5..28be71aa677ed8cb9a9d06b3aba7af40f0992f68 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -976,5 +976,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -981,5 +981,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
       * @return True if ridable in water
       */
      boolean isRidableInWater();

patches/api/0035-Flying-Fall-Damage-API.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Flying Fall Damage API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index f569064325dceed352b3ab993add415526b93950..878d10ab18d325e82b42f83fce19360d187322ae 100644
+index b4f6f2ee270ce7bfb2e63727244ca7def5fdfcb9..8d1bdf02266799c9ca33ec72a6c063856916e3fc 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2880,5 +2880,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2898,5 +2898,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param invulnerableTicks Invulnerable ticks remaining
       */
      void setSpawnInvulnerableTicks(int invulnerableTicks);

patches/api/0036-Add-back-player-spawned-endermite-API.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add back player spawned endermite API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Endermite.java b/src/main/java/org/bukkit/entity/Endermite.java
-index 9e7f42caab1204036f4203354c115fd40c6def92..1bc6a6930e9a5881a4fe4bf208da4430d90d799a 100644
+index 138d2530de2410f4a9424dabd3e5ce0cd1c1dcd2..10a8d64ad2da0be2c14f34c3e7d1957c6f2883d1 100644
 --- a/src/main/java/org/bukkit/entity/Endermite.java
 +++ b/src/main/java/org/bukkit/entity/Endermite.java
-@@ -3,24 +3,20 @@ package org.bukkit.entity;
+@@ -3,25 +3,21 @@ package org.bukkit.entity;
  public interface Endermite extends Monster {
 
      /**
@@ -36,4 +36,5 @@ index 9e7f42caab1204036f4203354c115fd40c6def92..1bc6a6930e9a5881a4fe4bf208da4430
       */
 -    @Deprecated
      void setPlayerSpawned(boolean playerSpawned);
- }
+     // Paper start
+     /**

patches/api/0050-Debug-Marker-API.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Debug Marker API
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 581c797b660cd190dc368a4d3f1c01717e98a4a6..827ff8d71391a7e7b4273c85fe3b6601dab68f77 100644
+index 6d46cc8674e488aa988722e09749f756a423b9e4..e5943f1313f97dd6a353873d54424ae70d46dcef 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -2500,5 +2500,89 @@ public final class Bukkit {
@@ -99,7 +99,7 @@ index 581c797b660cd190dc368a4d3f1c01717e98a4a6..827ff8d71391a7e7b4273c85fe3b6601
      // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 7b499d4501e2123b22fd8311c68b8f7b3c41beed..0e4d5345a5590d1a5d98cf11eb6e3649303c3ebb 100644
+index 3ebce913ff1063de417aa3dc3b4af6d538078db2..a7e2fab3e174fe2c1d79d904f7eaff88dd0c3c82 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -2179,5 +2179,75 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -260,10 +260,10 @@ index 8effbbd33c0af0ac421e5aef1586e8579ef097e4..0cd49cb31b21e52009f6220d505aa2a3
 
      /**
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 878d10ab18d325e82b42f83fce19360d187322ae..3e9b58f1f63e472fa292d25002c5aff8c474fca1 100644
+index 8d1bdf02266799c9ca33ec72a6c063856916e3fc..d2e749b08ab660ffc8ed50e4243cdb4da3447611 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2894,5 +2894,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2912,5 +2912,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @return True if fall damage is enabled when {@link #getAllowFlight()} is true
       */
      public boolean hasFlyingFallDamage();

patches/api/0052-Add-death-screen-API.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add death screen API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index d0d617284248065e728e4940d240be5bff1103e4..80f0d631a9780ec853b2ab44d5bcbec45f7d4051 100644
+index 876eb0540f328073d8e44e9f75089d945f0a523d..9c2dcca0b6e34a3083226360575f0956a077d767 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2972,5 +2972,21 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2990,5 +2990,21 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * Clears all debug block highlights
       */
      void clearBlockHighlights();

patches/server/0001-Pufferfish-Server-Changes.patch

@@ -1881,10 +1881,10 @@ index 540bc9500c35c0db719b00aa26f6fb3a1b08ed9f..806cb760822a99316b08ad95ff8922df
      int LARGE_MAX_STACK_SIZE = 64;
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index a80f4abf8a0c6c395f407c8bf25b44a64b0b9fe3..bf17305137f61455cc477515e054e6a65f976c45 100644
+index a1421689445b9df3f25889845c21cf37a439afe2..d96422f871c18303ce7ff7a182c685b0ddbfa04d 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -292,7 +292,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -291,7 +291,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      public double yo;
      public double zo;
      private Vec3 position;
@@ -1893,7 +1893,7 @@ index a80f4abf8a0c6c395f407c8bf25b44a64b0b9fe3..bf17305137f61455cc477515e054e6a6
      private ChunkPos chunkPosition;
      private Vec3 deltaMovement;
      private float yRot;
-@@ -414,6 +414,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -413,6 +413,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          return this.originWorld;
      }
      // Paper end
@@ -1905,7 +1905,7 @@ index a80f4abf8a0c6c395f407c8bf25b44a64b0b9fe3..bf17305137f61455cc477515e054e6a6
      public float getBukkitYaw() {
          return this.yRot;
      }
-@@ -488,17 +493,36 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -487,17 +492,36 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          this.isLegacyTrackingEntity = isLegacyTrackingEntity;
      }
 
@@ -1943,7 +1943,7 @@ index a80f4abf8a0c6c395f407c8bf25b44a64b0b9fe3..bf17305137f61455cc477515e054e6a6
          for (Entity passenger : passengers) {
              org.spigotmc.TrackingRange.TrackingRangeType passengerType = passenger.trackingRangeType;
              int passengerRange = chunkMap.getEntityTrackerRange(passengerType.ordinal());
-@@ -507,6 +531,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -506,6 +530,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                  range = passengerRange;
              }
          }
@@ -1953,7 +1953,7 @@ index a80f4abf8a0c6c395f407c8bf25b44a64b0b9fe3..bf17305137f61455cc477515e054e6a6
 
          return chunkMap.playerEntityTrackerTrackMaps[type.ordinal()].getObjectsInRange(MCUtil.getCoordinateKey(this));
      }
-@@ -788,6 +815,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -787,6 +814,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      // CraftBukkit end
 
      public void baseTick() {
@@ -1966,7 +1966,7 @@ index a80f4abf8a0c6c395f407c8bf25b44a64b0b9fe3..bf17305137f61455cc477515e054e6a6
          this.level.getProfiler().push("entityBaseTick");
          if (firstTick && this instanceof net.minecraft.world.entity.NeutralMob neutralMob) neutralMob.tickInitialPersistentAnger(level); // Paper - Update last hurt when ticking
          this.feetBlockState = null;
-@@ -4016,16 +4049,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4015,16 +4048,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
 
      public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tag, double speed) {
@@ -1992,7 +1992,7 @@ index a80f4abf8a0c6c395f407c8bf25b44a64b0b9fe3..bf17305137f61455cc477515e054e6a6
              double d1 = 0.0D;
              boolean flag = this.isPushedByFluid();
              boolean flag1 = false;
-@@ -4033,14 +4068,61 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4032,14 +4067,61 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              int k1 = 0;
              BlockPos.MutableBlockPos blockposition_mutableblockposition = new BlockPos.MutableBlockPos();
 
@@ -2060,7 +2060,7 @@ index a80f4abf8a0c6c395f407c8bf25b44a64b0b9fe3..bf17305137f61455cc477515e054e6a6
 
                              if (d2 >= axisalignedbb.minY) {
                                  flag1 = true;
-@@ -4062,9 +4144,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4061,9 +4143,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                                  // CraftBukkit end
                              }
                          }
@@ -2317,7 +2317,7 @@ index a7575b5ef56af6f53448d391abb4956e130148ca..e752c83df50fb9b670ecea2abc95426c
                          return false;
                      }
 diff --git a/src/main/java/net/minecraft/world/entity/ambient/Bat.java b/src/main/java/net/minecraft/world/entity/ambient/Bat.java
-index 50d4595b81f24949011c7565c5e3fc8c26c86019..234ad92d666775dcf5a29a60551b17cbb1d8e6ec 100644
+index def01d221f36d71640bf4ef982a984909aacc6da..bfea05018d9515fa7a9a8c04d4e2a63e0f3cd0d4 100644
 --- a/src/main/java/net/minecraft/world/entity/ambient/Bat.java
 +++ b/src/main/java/net/minecraft/world/entity/ambient/Bat.java
 @@ -253,13 +253,22 @@ public class Bat extends AmbientCreature {
@@ -2584,7 +2584,7 @@ index a1a625a8dacf4d2bbf75ddd90dce1b1be663c919..23e375c9a6955d03e0fc9be91ff04032
          return false;
      }
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-index c61ed38d0a824fee9b45acfc862baf03c85fe54b..85fb907fb149961611310c355d0911d81f1b735c 100644
+index 713c11d6547cb02ac4b6a02aec07a8ba68019f3f..bf828b9a36fc70bcf4c4d87d5db2d37aa384499c 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
 @@ -42,6 +42,36 @@ public abstract class Projectile extends Entity {

patches/server/0005-Purpur-client-support.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Purpur client support
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index af7acb628b84539b1ee5ef1934f75f091c4cd91e..63aef471ceba18c2b296f4e287837c6df44809d7 100644
+index e5af7ef4ada68922a70f593ccec555ecb50627a9..47d545a15b508454452699fe3e333b2bacc3159e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -261,6 +261,7 @@ public class ServerPlayer extends Player {
@@ -43,10 +43,10 @@ index 59608a53bbf0eccf118b4d65557444f6532fedb4..bfaa37739230107b73f81e227660e950
              try {
                  byte[] data = new byte[packet.data.readableBytes()];
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 968aa80b57a31d89852c6f4bc0ec5ed4a98c6530..e5d1503e89ba42527bd3bdd7fddd45d494a0173c 100644
+index b1136b9c39b16cbb9dfe460f88000f74ccd4f571..622ec4316df5bae2466f28173c121634f73767d1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2937,4 +2937,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2944,4 +2944,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return this.spigot;
      }
      // Spigot end

patches/server/0007-Component-related-conveniences.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Component related conveniences
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 63aef471ceba18c2b296f4e287837c6df44809d7..5f854b9d25d5965268a089a992ee9bacf7b3aa0f 100644
+index 47d545a15b508454452699fe3e333b2bacc3159e..57c1ab010ff459dfb4e7d44e6afba36b56a19654 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1690,6 +1690,26 @@ public class ServerPlayer extends Player {
+@@ -1709,6 +1709,26 @@ public class ServerPlayer extends Player {
          this.lastSentExp = -1; // CraftBukkit - Added to reset
      }
 
@@ -81,10 +81,10 @@ index 67bce77093dcc126098731047447da2031e3388d..c4088446d30c3b25cf196f51fd394cd0
          return this.isFireSource;
      }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index bf17305137f61455cc477515e054e6a65f976c45..9ea08fc57efd9f593798a7c5feffaf9663ff76ad 100644
+index d96422f871c18303ce7ff7a182c685b0ddbfa04d..4f1ed7708311d8a8d63706592e9feed8de2a4aa2 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3798,6 +3798,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3797,6 +3797,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          return SlotAccess.NULL;
      }