Repo-Mirror/DivineMC
9
0
Fork 0
mirror of https://github.com/BX-Team/DivineMC.git synced 2026-01-06 15:41:52 +00:00
Code Issues Releases Activity

update upstream

Browse Source
This commit is contained in:
NONPLAYT
2023-03-31 22:44:57 +03:00
parent fa3282fda5
commit 084db4c799
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -2,7 +2,7 @@ group=gq.bxteam.divinemc
version=1.19.4-R0.1-SNAPSHOT
mcVersion=1.19.4
purpurRef=49d99462fa663a4afc253e5525bb97092b6038de
purpurRef=bd5c4b67e6bdb6d2d6d67fd9bc63bbd99b24ab78
org.gradle.jvmargs=-Xmx2G
org.gradle.caching=true

4
patches/api/0001-Divine-Configuration.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Divine Configuration
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index c293dbc96051a5a5d11dc445b8c389e2ce33ec84..19df56efa6a6911cd5eda620dc20082885317954 100644
index 730caafaf9629664ba125f3884559da76616f655..060a14fdbb25faa671ada919344c086f7ec43c20 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1983,6 +1983,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1980,6 +1980,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
}
// Purpur end

6
patches/server/0002-Divine-Configuration.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Divine Configuration
diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
index 2cc44fbf8e5bd436b6d4e19f6c06b351e750cb31..de5086590c457546c6798bb064fe9af0cc6696b1 100644
index 5af15c85fab72034b97ac210ff775e0a8fa0be78..b9a58a56b92c6bd692120b6eb4ec6e8215cfbf19 100644
--- a/src/main/java/co/aikar/timings/TimingsExport.java
+++ b/src/main/java/co/aikar/timings/TimingsExport.java
@@ -242,7 +242,8 @@ public class TimingsExport extends Thread {
@@ -243,7 +243,8 @@ public class TimingsExport extends Thread {
pair("spigot", mapAsJSON(Bukkit.spigot().getSpigotConfig(), null)),
pair("bukkit", mapAsJSON(Bukkit.spigot().getBukkitConfig(), null)),
pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null)), // Pufferfish
@@ -95,7 +95,7 @@ index 0000000000000000000000000000000000000000..cbd2e01fb7d88c056b39a791cf0e4b47
\ No newline at end of file
diff --git a/src/main/java/gq/bxteam/divinemc/config/DivineConfig.java b/src/main/java/gq/bxteam/divinemc/config/DivineConfig.java
new file mode 100644
index 0000000000000000000000000000000000000000..87346c66366a579f09199fd89f88170f4120c6e0
index 0000000000000000000000000000000000000000..d05d801476a31b728d9259aa56de57bfe3770d70
--- /dev/null
+++ b/src/main/java/gq/bxteam/divinemc/config/DivineConfig.java
@@ -0,0 +1,135 @@