Updated Upstream (Paper)

.github/FUNDING.yml

@@ -1,9 +1,9 @@
 # These are supported funding model platforms
 
-# github: [PrismarineTeam, AlphaKR93] # Stripe doesn't support korea
-# open_collective: Prismarine # WIP
-patreon: alphakr93_
-# issuehunt: alphakr93
-ko_fi: alphakr93
-custom: ["https://www.paypal.me/alphakr93"]#, "https://toon.at/donate/637349490049950363", "https://www.buymeacoffee.com/alpha93", "TOSS HERE"]
+# Stripe github: [PrismarineTeam, AlphaKR93] custom: "https://www.buymeacoffee.com/alphakr93"
+# open_collective: Prismarine # Work In Progress
+patreon: alphakr93_ # Work In Progress
+# issuehunt: alphakr93 # Work In Progress
+ko_fi: alphakr93 # Work In Progress
+custom: ["https://www.paypal.me/alphakr93", "https://toss.me/alphakr93"] #"https://toon.at/donate/637349490049950363"
 # liberapay: alphakr93

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

@@ -1032,10 +1032,10 @@ index 9e7f42caab1204036f4203354c115fd40c6def92..1bc6a6930e9a5881a4fe4bf208da4430
      void setPlayerSpawned(boolean playerSpawned);
  }
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 4d4a0d15876cc48c9c0456b9f11a5dda37fd56ce..1f116f33e6dbce8d8d67d799beeedecf792cd728 100644
+index 6dd81f07ef4d6993187987d3352a01771ffb715e..be7ad89699619aba9df4699403c9a70fd2bc9da1 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -919,4 +919,42 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -946,4 +946,42 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
       */
      boolean wouldCollideUsing(@NotNull BoundingBox boundingBox);
      // Paper End - Collision API
@@ -1171,10 +1171,10 @@ index d0bef15785493b512ff0f7414c1d58d38fead581..fd213c026fdfb3030d0c37f651a88857
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 8fa8922ad2fb0ea8f770368faff61e56e9761df9..6c46107e13a5fd648d64844ffa5b326d4909d702 100644
+index 4af5e8d0cba6555f7615e4e809d9aff221c0dc4d..4a4606f2598b868e43c270cd3056d44549bc914e 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -909,4 +909,41 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -986,4 +986,41 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       */
      void setHurtDirection(float hurtDirection);
      // Paper end

patches/api/0007-Purpur-PR-Fire-Immune-API.patch

@@ -27,10 +27,10 @@ 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/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 1f116f33e6dbce8d8d67d799beeedecf792cd728..94e824ea3fcdce12ed5da0cbb5ad4a031e14707f 100644
+index be7ad89699619aba9df4699403c9a70fd2bc9da1..2c063e7c3725c23129478bcb386b7db029c0821e 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -956,5 +956,20 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -983,5 +983,20 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
       * @return True if in daylight
       */
      boolean isInDaylight();