9
0
mirror of https://github.com/BX-Team/DivineMC.git synced 2026-01-04 15:31:43 +00:00

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)
This commit is contained in:
NONPLAYT
2025-05-26 01:57:08 +03:00
parent b78f6c07f5
commit 8285ee9dd5
3 changed files with 6 additions and 6 deletions

View File

@@ -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) {

View File

@@ -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;
}

View File

@@ -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