Repo-Mirror/DivineMC
9
0
Fork 0
mirror of https://github.com/BX-Team/DivineMC.git synced 2025-12-19 14:59:25 +00:00
Code Issues Releases Activity

Updated Upstream (Purpur)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Purpur Changes:
PurpurMC/Purpur@fc89fde5 Updated Upstream (Paper)
This commit is contained in:
NONPLAYT
2025-11-03 01:57:37 +03:00
parent b3e32e1457
commit 1d79525ed6
21 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
divinemc-api/build.gradle.kts.patch
View File

@@ -125,7 +125,7 @@
"https://www.javadocs.dev/org.slf4j/slf4j-api/$slf4jVersion/",
"https://logging.apache.org/log4j/2.x/javadoc/log4j-api/",
- "https://www.javadocs.dev/org.apache.maven.resolver/maven-resolver-api/1.7.3",
+ "https://javadoc.io/doc/org.apache.maven.resolver/maven-resolver-api/1.9.22", // DivineMC - Bump dependencies
+ "https://www.javadocs.dev/org.apache.maven.resolver/maven-resolver-api/1.9.22", // DivineMC - Bump dependencies
)
options.tags("apiNote:a:API Note:")

4
divinemc-api/paper-patches/features/0006-Extend-Sound-API.patch
View File

@@ -39,10 +39,10 @@ index fbee4ab2faaeba8d798aaba2e1837315ed56a184..581d71e716e8ecfe9ab2c4d3947c86c6
+ // DivineMC end - Extend Sound API
}
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index 84569b53a4e39a2a642a8f0638f8970fb0cb8b0f..9bf0c54bbc89a9c6aa4f00424628786679b56937 100644
index 49981db2398a3f88c1d62c91e35d637c4b92f876..38fbb90b6ebab18ee50c455951e44deb962d141f 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -1361,4 +1361,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -1377,4 +1377,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
*/
void setImmuneToFire(@Nullable Boolean fireImmune);
// Purpur end - Fire Immunity API

4
divinemc-api/paper-patches/features/0008-Paper-PR-Player-standing-on-position-API.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Paper PR: Player standing on position API
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index 9bf0c54bbc89a9c6aa4f00424628786679b56937..3e5a671edc77a1ba4b70e5938d9d178a8075a1a3 100644
index 38fbb90b6ebab18ee50c455951e44deb962d141f..b5f9a4ffe8cfb5e9e63b8cec94e7e96bea201576 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -1307,6 +1307,33 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -1323,6 +1323,33 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
void broadcastHurtAnimation(@NotNull java.util.Collection<Player> players);
// Paper end - broadcast hurt animation

4
divinemc-api/paper-patches/features/0010-SparklyPaper-Parallel-world-ticking.patch
View File

@@ -30,10 +30,10 @@ index bf664ec7a3974abdb7fd3266b08803a02cb05929..d21f2c33480177f4892c906b80ffe896
+ // DivineMC end - Parallel world ticking
}
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index d320e8b621a8725d07579fbc3182df9b4822e3fb..6128b98305ee0c843df4bfef13fcb2f6a809d416 100644
index 7f55f19173c369c73b81a5784c6bedd648527d6b..be3035da71001fba183fe0bc79fce36a817befd2 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -4722,4 +4722,23 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
@@ -4725,4 +4725,23 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
}
}
}