Updated Upstream (Paper)

gradle.properties

@@ -1,7 +1,7 @@
 group = net.prismarineteam.prismarine
 version = 1.19.2-R0.1-SNAPSHOT
 
-paperCommit = ff67f1fa18c19a61f693ae391d6fa6b640e25f44
+paperCommit = 77a50b95dada2d73b92fdd95d674d357b64bc7d4
 
 org.gradle.caching = true
 org.gradle.parallel = true

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

@@ -2607,7 +2607,7 @@ 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 008bd65d838819431a0823c6ac5925774bd155a1..fc4bd8ad4836aa6bdd228885f0aeb22500782af5 100644
+index 756b8e68c6b7c21c1ef78b68da9e41db4828c7c9..568760d0824ecd7c46536479d94e3155900ce89a 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 {
@@ -2692,7 +2692,7 @@ index 008bd65d838819431a0823c6ac5925774bd155a1..fc4bd8ad4836aa6bdd228885f0aeb225
          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 {
+@@ -4017,16 +4050,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
 
      public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tag, double speed) {
@@ -2718,7 +2718,7 @@ index 008bd65d838819431a0823c6ac5925774bd155a1..fc4bd8ad4836aa6bdd228885f0aeb225
              double d1 = 0.0D;
              boolean flag = this.isPushedByFluid();
              boolean flag1 = false;
-@@ -4033,14 +4068,61 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4034,14 +4069,61 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              int k1 = 0;
              BlockPos.MutableBlockPos blockposition_mutableblockposition = new BlockPos.MutableBlockPos();
 
@@ -2786,7 +2786,7 @@ index 008bd65d838819431a0823c6ac5925774bd155a1..fc4bd8ad4836aa6bdd228885f0aeb225
 
                              if (d2 >= axisalignedbb.minY) {
                                  flag1 = true;
-@@ -4062,9 +4144,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4063,9 +4145,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                                  // CraftBukkit end
                              }
                          }

patches/server/0008-Akarin-patches.patch

@@ -28,7 +28,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
 0011 - Swaps the predicate order of collision
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index efd84a22bc063fe6266be876a38186c08296caa2..2baed6e10f60ffd8e66c58aa44f7b4737b497dc4 100644
+index 46aab96ceae032aa5e8b33ec8dc2a9e88bee2d7f..ca9473b6d6824f932bc0c7c308b83fb6c8856aaa 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -419,7 +419,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -40,7 +40,7 @@ index efd84a22bc063fe6266be876a38186c08296caa2..2baed6e10f60ffd8e66c58aa44f7b473
      public float getBukkitYaw() {
          return this.yRot;
      }
-@@ -1969,38 +1969,37 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1970,38 +1970,37 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      public void playerTouch(Player player) {}
 
      public void push(Entity entity) {

patches/server/0010-Slice-Server-Patches.patch

@@ -184,7 +184,7 @@ index 3441339e1ba5efb0e25c16fa13cb65d2fbdafc42..869b85b4c482d8bd0a48b948cffcf362
          }
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 2baed6e10f60ffd8e66c58aa44f7b4737b497dc4..f3c16377e123bc78239920051462a80c5888ce06 100644
+index ca9473b6d6824f932bc0c7c308b83fb6c8856aaa..e5769f53fc9a333eefaf5e78f9fde9ec649525db 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -879,6 +879,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -202,7 +202,7 @@ index 2baed6e10f60ffd8e66c58aa44f7b4737b497dc4..f3c16377e123bc78239920051462a80c
              this.setSharedFlagOnFire(this.remainingFireTicks > 0);
          }
 
-@@ -3147,7 +3155,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3148,7 +3156,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              this.entityData.markDirty(Entity.DATA_AIR_SUPPLY_ID);
              return;
          }

patches/server/0014-Purpur-PR-Fire-Immune-API.patch

@@ -27,7 +27,7 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index f3c16377e123bc78239920051462a80c5888ce06..85d8711a02208f99840900d201a3972d3e2b7cc2 100644
+index e5769f53fc9a333eefaf5e78f9fde9ec649525db..508c77168d4f709efcb19467e5f733288917d076 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -399,6 +399,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -38,7 +38,7 @@ index f3c16377e123bc78239920051462a80c5888ce06..85d8711a02208f99840900d201a3972d
 
      public void setOrigin(@javax.annotation.Nonnull Location location) {
          this.origin = location.toVector();
-@@ -1673,7 +1674,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1674,7 +1675,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
 
      public boolean fireImmune() {
@@ -47,7 +47,7 @@ index f3c16377e123bc78239920051462a80c5888ce06..85d8711a02208f99840900d201a3972d
      }
 
      public boolean causeFallDamage(float fallDistance, float damageMultiplier, DamageSource damageSource) {
-@@ -2309,6 +2310,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2310,6 +2311,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                  nbt.putBoolean("Paper.FreezeLock", true);
              }
              // Paper end
@@ -61,7 +61,7 @@ index f3c16377e123bc78239920051462a80c5888ce06..85d8711a02208f99840900d201a3972d
              return nbt;
          } catch (Throwable throwable) {
              CrashReport crashreport = CrashReport.forThrowable(throwable, "Saving entity NBT");
-@@ -2476,6 +2484,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2477,6 +2485,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                  freezeLocked = nbt.getBoolean("Paper.FreezeLock");
              }
              // Paper end

patches/server/0028-Force-despawn-API.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Force despawn API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 85d8711a02208f99840900d201a3972d3e2b7cc2..fdb54fe3c496615f9b532cc8ccc950294d19243b 100644
+index 508c77168d4f709efcb19467e5f733288917d076..47ffa021d14d2dbb07ed04ca8b4a807915e62b94 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4433,6 +4433,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4434,6 +4434,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
 
      public void checkDespawn() {}