From 8285ee9dd5f8160cc666b4135607f82f9e5e7715 Mon Sep 17 00:00:00 2001
From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com>
Date: Mon, 26 May 2025 01:57:08 +0300
Subject: [PATCH] Updated Upstream (Purpur)

Upstream has released updates that appear to apply and compile correctly

Purpur Changes:
PurpurMC/Purpur@470df8e7 will this bandaid fix work?
PurpurMC/Purpur@f565bc23 use daemon in github actions workflow
PurpurMC/Purpur@42286249 Updated Upstream (Paper)
---
 .../features/0007-Optimize-canSee-checks.patch              | 6 +++---
 ...per-PR-Add-FillBottleEvents-for-player-and-dispens.patch | 4 ++--
 gradle.properties                                           | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/divinemc-server/paper-patches/features/0007-Optimize-canSee-checks.patch b/divinemc-server/paper-patches/features/0007-Optimize-canSee-checks.patch
index 39f6f65..5e8ec9a 100644
--- a/divinemc-server/paper-patches/features/0007-Optimize-canSee-checks.patch
+++ b/divinemc-server/paper-patches/features/0007-Optimize-canSee-checks.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Optimize canSee checks
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 616c25e3e447923235e2586f8a74d1eca39cbb32..00408099f47a31ed2c580727ddf908549edfb9a4 100644
+index fcc7bc9098e2544588d8b36dd0cff59e6a2563bd..d9b701e4b53b71e7e430ebab6b24220eac710e0d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -213,7 +213,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -216,7 +216,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      private boolean hasPlayedBefore = false;
      private final ConversationTracker conversationTracker = new ConversationTracker();
      private final Set<String> channels = new HashSet<String>();
@@ -17,7 +17,7 @@ index 616c25e3e447923235e2586f8a74d1eca39cbb32..00408099f47a31ed2c580727ddf90854
      private final Set<UUID> unlistedEntities = new HashSet<>(); // Paper - Add Listing API for Player
      private static final WeakHashMap<Plugin, WeakReference<Plugin>> pluginWeakReferences = new WeakHashMap<>();
      private int hash = 0;
-@@ -2266,9 +2266,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2269,9 +2269,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public boolean canSee(org.bukkit.entity.Entity entity) {
diff --git a/divinemc-server/paper-patches/features/0011-Paper-PR-Add-FillBottleEvents-for-player-and-dispens.patch b/divinemc-server/paper-patches/features/0011-Paper-PR-Add-FillBottleEvents-for-player-and-dispens.patch
index b8fcd74..7805ede 100644
--- a/divinemc-server/paper-patches/features/0011-Paper-PR-Add-FillBottleEvents-for-player-and-dispens.patch
+++ b/divinemc-server/paper-patches/features/0011-Paper-PR-Add-FillBottleEvents-for-player-and-dispens.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Paper PR: Add FillBottleEvents for player and dispenser
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 2e28891cb4c058c022b06040c0283aacf4c2445e..e3ba9a423ca15d611196400e394a637c85669087 100644
+index 1b1a2546659863b9224d148ea39cdc6cdf4927a3..a9d23ee8bfe57311e84e50525a49abf09b03896d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -2065,4 +2065,18 @@ public class CraftEventFactory {
+@@ -2068,4 +2068,18 @@ public class CraftEventFactory {
  
          return event;
      }
diff --git a/gradle.properties b/gradle.properties
index 393b9ef..3eb0c67 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group = org.bxteam.divinemc
 version=1.21.5-R0.1-SNAPSHOT
 
 mcVersion=1.21.5
-purpurRef=fd78b90f2041e50b2a94110859b951fc8fa320e9
+purpurRef=42286249e5ca6bb889f912992ae8212de009dfce
 experimental=false
 
 org.gradle.configuration-cache=true