Skip to content

Commit

Permalink
Updated Upstream (Purpur)
Browse files Browse the repository at this point in the history
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by SapphireMC and as with ANY update, please do your own testing

Purpur Changes:
PurpurMC/Purpur@4024ae6 Updated Upstream (Paper)
PurpurMC/Purpur@2f994e7 remove pufferfish's timings warning
PurpurMC/Purpur@7e7693c 1.19.2
  • Loading branch information
DenaryDev committed Aug 7, 2022
1 parent 9b9e288 commit cbaa1ff
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 8 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ group=io.sapphiremc.sapphire
version=1.19.1-R0.1-SNAPSHOT

mcVersion=1.19.1
purpurRef=1fce5dad36053b47ceebde1ff3ae87a2d34afdc7
purpurRef=2f994e7194dd471cc66bf0d1783a176d87b5e870

org.gradle.caching=true
org.gradle.parallel=true
Expand Down
13 changes: 6 additions & 7 deletions patches/server/0002-Sapphire-config-files.patch
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,15 @@ Subject: [PATCH] Sapphire config files


diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
index fa8eb9fb4122097d2a5cb1d07f75c830ad6b2f57..fe104c36773f8e8f095a6c075919f0ba8c5e2fc5 100644
index 2cc44fbf8e5bd436b6d4e19f6c06b351e750cb31..176ce96bf720fab9e714661ff5671906e01e6b57 100644
--- a/src/main/java/co/aikar/timings/TimingsExport.java
+++ b/src/main/java/co/aikar/timings/TimingsExport.java
@@ -245,8 +245,9 @@ public class TimingsExport extends Thread {
@@ -242,7 +242,8 @@ public class TimingsExport extends Thread {
pair("spigot", mapAsJSON(Bukkit.spigot().getSpigotConfig(), null)),
pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null)),
pair("pufferfish", mapAsJSON(gg.pufferfish.pufferfish.PufferfishConfig.getConfigCopy(), null)), // Pufferfish
- pair("purpur", mapAsJSON(Bukkit.spigot().getPurpurConfig(), null))
+ pair("purpur", mapAsJSON(Bukkit.spigot().getPurpurConfig(), null)),
// Purpur end
pair("bukkit", mapAsJSON(Bukkit.spigot().getBukkitConfig(), null)),
pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null)), // Pufferfish
- pair("pufferfish", mapAsJSON(gg.pufferfish.pufferfish.PufferfishConfig.getConfigCopy(), null)) // Pufferfish
+ pair("pufferfish", mapAsJSON(gg.pufferfish.pufferfish.PufferfishConfig.getConfigCopy(), null)), // Pufferfish
+ pair("sapphire", mapAsJSON(Bukkit.spigot().getSapphireConfig(), null)) // Sapphire
));

Expand Down

0 comments on commit cbaa1ff

Please sign in to comment.