Updated Upstream (Paper & Purpur & Pufferfish)

gradle.properties

@@ -1,7 +1,7 @@
 group = net.prismarineteam.prismarine
 version = 1.19.2-R0.1-SNAPSHOT
 
-paperCommit = 25cd3eee99a96b360ab947fb78459045f29b2b78
+paperCommit = 0249750b8f7df62ed2a3897205dee73dad0bca65
 
 org.gradle.caching = true
 org.gradle.parallel = true

patches/api/0001-Pufferfish-API-Changes.patch

@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: AlphaKR93 <[email protected]>
-Date: Tue, 25 Oct 2022 18:32:16 +0900
+Date: Thu, 27 Oct 2022 09:45:25 +0000
 Subject: [PATCH] Pufferfish API Changes
 
 Original by Kevin Raneri <[email protected]>

patches/api/0002-Purpur-API-Changes.patch

@@ -1,9 +1,11 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: AlphaKR93 <[email protected]>
-Date: Tue, 25 Oct 2022 18:39:09 +0900
+Date: Thu, 27 Oct 2022 09:47:08 +0000
 Subject: [PATCH] Purpur API Changes
 
-Copyright 2022 PurpurMC LLC
+Original by PurpurMC Team
+
+Copyright (C) 2022 PurpurMC LLC
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the Software), to deal
@@ -1036,10 +1038,10 @@ index 138d2530de2410f4a9424dabd3e5ce0cd1c1dcd2..10a8d64ad2da0be2c14f34c3e7d1957c
      // Paper start
      /**
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 33a6b7a27dc91552799c07a7aad9b3df31ad13f7..28be71aa677ed8cb9a9d06b3aba7af40f0992f68 100644
+index 33a6b7a27dc91552799c07a7aad9b3df31ad13f7..3959765b110b6fed91348c11ff85e302a885776c 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -951,4 +951,42 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -951,4 +951,55 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
       */
      boolean wouldCollideUsing(@NotNull BoundingBox boundingBox);
      // Paper End - Collision API
@@ -1080,6 +1082,19 @@ index 33a6b7a27dc91552799c07a7aad9b3df31ad13f7..28be71aa677ed8cb9a9d06b3aba7af40
 +     * @return True if in daylight
 +     */
 +    boolean isInDaylight();
++
++    /**
++     * Checks if the entity is fire immune
++     *
++     * @return True if fire immune
++     */
++    boolean isImmuneToFire();
++
++    /**
++     * Sets if the entity is fire immune
++     * Set this to null to restore the entity type default
++     */
++    void setImmuneToFire(@Nullable Boolean fireImmune);
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/entity/IronGolem.java b/src/main/java/org/bukkit/entity/IronGolem.java
@@ -1108,10 +1123,18 @@ index 655e37cb3a09610a3f3df805d6dcad17d722da62..09fd716c8fc9ea34a1cbf87bcbe22df0
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/entity/Item.java b/src/main/java/org/bukkit/entity/Item.java
-index d0bef15785493b512ff0f7414c1d58d38fead581..fd213c026fdfb3030d0c37f651a88857ca038cba 100644
+index d0bef15785493b512ff0f7414c1d58d38fead581..35e7684cf8d9d5eea4b88ada24ff252ba225bd62 100644
 --- a/src/main/java/org/bukkit/entity/Item.java
 +++ b/src/main/java/org/bukkit/entity/Item.java
-@@ -153,4 +153,62 @@ public interface Item extends Entity {
+@@ -1,6 +1,7 @@
+ package org.bukkit.entity;
+
+ import java.util.UUID;
++
+ import org.bukkit.inventory.ItemStack;
+ import org.jetbrains.annotations.NotNull;
+ import org.jetbrains.annotations.Nullable;
+@@ -153,4 +154,64 @@ public interface Item extends Entity {
       */
      public void setHealth(int health);
      // Paper end
@@ -1149,7 +1172,9 @@ index d0bef15785493b512ff0f7414c1d58d38fead581..fd213c026fdfb3030d0c37f651a88857
 +     * Set whether or not this item is immune to fire
 +     *
 +     * @param immuneToFire True to make immune to fire
++     @deprecated use {@link #setImmuneToFire(Boolean)} instead
 +     */
++    @Deprecated
 +    void setImmuneToFire(boolean immuneToFire);
 +
 +    /**

patches/api/0010-Force-despawn-API.patch → patches/api/0009-Force-despawn-API.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Force despawn API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index fe84d277c14b41e0718d63695117088ff29991f8..2517519e8de8088e5876bfa5bc3fec2225baec8c 100644
+index 3959765b110b6fed91348c11ff85e302a885776c..9a90a098e0b77b708ebedf30e0538e8e67e292f1 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -371,6 +371,10 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent

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

@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: AlphaKR93 <[email protected]>
-Date: Tue, 25 Oct 2022 18:32:01 +0900
+Date: Thu, 27 Oct 2022 09:45:25 +0000
 Subject: [PATCH] Pufferfish Server Changes
 
 Original by Kevin Raneri <[email protected]>