Skip to content

Commit

Permalink
Updated Upstream (Paper)
Browse files Browse the repository at this point in the history
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@718fab1 Add CPU name and JVM vendor info in timings (#7490)
PaperMC/Paper@7a21333 Fix setting the view distance to 32 (#7503)
PaperMC/Paper@4423e12 Update docs link in paper.yml (#7562)
PaperMC/Paper@b55ba19 Update README for new docs (#7561)
  • Loading branch information
BillyGalbreath committed Mar 10, 2022
1 parent e9af29e commit 51f7e1d
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
@@ -1,7 +1,7 @@
group = org.purpurmc.purpur
version = 1.18.2-R0.1-SNAPSHOT

paperCommit = e0b3f3f8cbcce581cc3cc3334b09f6165f964270
paperCommit = b55ba19ad321c3dfe5589ffd016aa2847101e55a

org.gradle.caching = true
org.gradle.parallel = true
Expand Down
8 changes: 4 additions & 4 deletions patches/server/0001-Pufferfish-Server-Changes.patch
Expand Up @@ -77,10 +77,10 @@ index 4beb35d1e5b013395f5df101e843f41c2ce174ad..5b10c880ac9daa66badf199bddd2653a
"Specification-Title" to "Bukkit",
"Specification-Version" to project.version,
diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
index 1cb0aae3e0c619a715766e0fa604dfd9a8caefcc..d3bb2a3ead944a89330bbced6812df73d174d061 100644
index 5ba64e1083b7cb1eec64d1925095c6ca5865ff07..a5e4467382422df6cff2b9f61f44feabfe7084f3 100644
--- a/src/main/java/co/aikar/timings/TimingsExport.java
+++ b/src/main/java/co/aikar/timings/TimingsExport.java
@@ -231,7 +231,8 @@ public class TimingsExport extends Thread {
@@ -238,7 +238,8 @@ public class TimingsExport extends Thread {
parent.put("config", createObject(
pair("spigot", mapAsJSON(Bukkit.spigot().getSpigotConfig(), null)),
pair("bukkit", mapAsJSON(Bukkit.spigot().getBukkitConfig(), null)),
Expand Down Expand Up @@ -113,7 +113,7 @@ index 218f5bafeed8551b55b91c7fccaf6935c8b631ca..f2fe6ea3719ff8b2913b7a3a939d7a5b
metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> {
Map<String, Map<String, Integer>> map = new HashMap<>();
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index 2becc9a274eddb1a01655f24f54d5cf72470580d..b59d521a4bf81ff45a70cb386bc14f9c0be56f20 100644
index 73bc7a82254114ab8a5cddaac02322438517d8a3..846055cd71396971323ce368af0715178ea87e5b 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -241,6 +241,15 @@ public class PaperConfig {
Expand Down Expand Up @@ -2202,7 +2202,7 @@ index e28e09aae1d95d9bed50a137e999e6d457e62478..27e90ca03275a42271bbe97ee1a63a35
}
}
diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
index edc6235288f0843608dae4552e05915e4067cbf2..d13b53c5497cece27ce06d43401e4f3b85652ceb 100644
index eb469eabf7a5888a4249a6267de0c993e65b2ad0..e2629dcf1b73c9c8ccdb126a7686ecd594d7c76f 100644
--- a/src/main/java/net/minecraft/server/level/ChunkMap.java
+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
@@ -457,7 +457,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
Expand Down
8 changes: 4 additions & 4 deletions patches/server/0008-Timings-stuff.patch
Expand Up @@ -5,10 +5,10 @@ Subject: [PATCH] Timings stuff


diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
index d3bb2a3ead944a89330bbced6812df73d174d061..aa906caf51d81b26a5565a92ea24fb79c920a73a 100644
index a5e4467382422df6cff2b9f61f44feabfe7084f3..abbfb819e327186ff2c05d8dbdf00ff2c18dc0ab 100644
--- a/src/main/java/co/aikar/timings/TimingsExport.java
+++ b/src/main/java/co/aikar/timings/TimingsExport.java
@@ -229,10 +229,14 @@ public class TimingsExport extends Thread {
@@ -236,10 +236,14 @@ public class TimingsExport extends Thread {
// Information on the users Config

parent.put("config", createObject(
Expand All @@ -26,7 +26,7 @@ index d3bb2a3ead944a89330bbced6812df73d174d061..aa906caf51d81b26a5565a92ea24fb79
));

new TimingsExport(listeners, parent, history).start();
@@ -273,6 +277,19 @@ public class TimingsExport extends Thread {
@@ -280,6 +284,19 @@ public class TimingsExport extends Thread {
return timingsCost;
}

Expand All @@ -47,7 +47,7 @@ index d3bb2a3ead944a89330bbced6812df73d174d061..aa906caf51d81b26a5565a92ea24fb79

JSONObject object = new JSONObject();
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index b59d521a4bf81ff45a70cb386bc14f9c0be56f20..ab045c0d6c24a246b436e14dc96e441897b9c87e 100644
index 846055cd71396971323ce368af0715178ea87e5b..949a0eab68e273aa45c96ce7dded0e980ad25627 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -252,6 +252,12 @@ public class PaperConfig {
Expand Down

0 comments on commit 51f7e1d

Please sign in to comment.