Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 17:37:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update Tuinity patches

Browse Source
This commit is contained in:
William Blake Galbreath
2020-03-25 19:29:47 -05:00
parent 23cd0d9652
commit 86c5a55f46
20 changed files with 365 additions and 1011 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
patches/api/0002-Tuinity-API-Patches.patch
View File

@@ -1,16 +1,18 @@
From 9c22c9759cf1460418eecb1224cc0bec509de0fa Mon Sep 17 00:00:00 2001
From e20cb2d48ea29c7f5330233ade4aa7a5ef2b156b Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Fri, 14 Dec 2018 21:52:29 -0800
Subject: [PATCH] Tuinity API Patches
---
pom.xml | 8 ++++--
src/main/java/org/bukkit/World.java | 28 +++++++++++++++++++++
src/main/java/org/bukkit/entity/Player.java | 23 +++++++++++++++++
3 files changed, 57 insertions(+), 2 deletions(-)
pom.xml | 8 ++++--
.../java/co/aikar/timings/TimingsExport.java | 3 +-
src/main/java/org/bukkit/Server.java | 8 ++++++
src/main/java/org/bukkit/World.java | 28 +++++++++++++++++++
src/main/java/org/bukkit/entity/Player.java | 23 +++++++++++++++
5 files changed, 67 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 58a1f7d0..19d003fa 100644
index 58a1f7d07..19d003fa8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,8 +18,8 @@
@@ -35,8 +37,41 @@ index 58a1f7d0..19d003fa 100644
<dependencies>
<!-- we need our custom version as it fixes some bugs on case sensitive file systems -->
<dependency>
diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
index 93d5a3f97..cb92d7b21 100644
--- a/src/main/java/co/aikar/timings/TimingsExport.java
+++ b/src/main/java/co/aikar/timings/TimingsExport.java
@@ -206,7 +206,8 @@ class TimingsExport extends Thread {
parent.put("config", createObject(
pair("spigot", mapAsJSON(Bukkit.spigot().getSpigotConfig(), null)),
pair("bukkit", mapAsJSON(Bukkit.spigot().getBukkitConfig(), null)),
- pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null))
+ pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null)), // Tuinity - add config to timings report
+ pair("tuinity", mapAsJSON(Bukkit.spigot().getTuinityConfig(), null)) // Tuinity - add config to timings report
));
new TimingsExport(listeners, parent, history).start();
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 80f9abdca..55ec8d2d0 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1371,6 +1371,14 @@ public interface Server extends PluginMessageRecipient {
}
// Paper end
+ // Tuinity start - add config to timings report
+ @NotNull
+ public org.bukkit.configuration.file.YamlConfiguration getTuinityConfig()
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+ // Tuinity end - add config to timings report
+
/**
* Sends the component to the player
*
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index af0637f7..a3ed3154 100644
index af0637f76..a3ed3154a 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -3165,6 +3165,34 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -75,7 +110,7 @@ index af0637f7..a3ed3154 100644
public class Spigot {
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 877ea4f3..5367975a 100644
index 877ea4f32..5367975ac 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1969,6 +1969,29 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM

32
patches/api/0003-Purpur-config-files.patch
View File

@@ -1,36 +1,37 @@
From 713489b865ff4aa3f8597b6415fe0b345156c504 Mon Sep 17 00:00:00 2001
From bb9d00d17399d52be12b31df4b9a29c10c196ea8 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Tue, 18 Feb 2020 20:30:03 -0600
Subject: [PATCH] Purpur config files
---
.../java/co/aikar/timings/TimingsExport.java | 24 ++++++++++++++++---
src/main/java/org/bukkit/Server.java | 17 +++++++++++++
2 files changed, 38 insertions(+), 3 deletions(-)
.../java/co/aikar/timings/TimingsExport.java | 25 ++++++++++++++++---
src/main/java/org/bukkit/Server.java | 12 +++++++++
2 files changed, 33 insertions(+), 4 deletions(-)
diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
index 93d5a3f9..b5111928 100644
index cb92d7b21..41dc89d99 100644
--- a/src/main/java/co/aikar/timings/TimingsExport.java
+++ b/src/main/java/co/aikar/timings/TimingsExport.java
@@ -204,9 +204,14 @@ class TimingsExport extends Thread {
@@ -204,10 +204,14 @@ class TimingsExport extends Thread {
// Information on the users Config
parent.put("config", createObject(
- pair("spigot", mapAsJSON(Bukkit.spigot().getSpigotConfig(), null)),
- pair("bukkit", mapAsJSON(Bukkit.spigot().getBukkitConfig(), null)),
- pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null))
- pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null)), // Tuinity - add config to timings report
- pair("tuinity", mapAsJSON(Bukkit.spigot().getTuinityConfig(), null)) // Tuinity - add config to timings report
+ // Purpur start
+ pair("server.properties", mapAsJSON(Bukkit.spigot().getServerProperties())),
+ pair("bukkit.yml", mapAsJSON(Bukkit.spigot().getBukkitConfig(), null)),
+ pair("spigot.yml", mapAsJSON(Bukkit.spigot().getSpigotConfig(), null)),
+ pair("paper.yml", mapAsJSON(Bukkit.spigot().getPaperConfig(), null)),
+ pair("tuinity.yml", mapAsJSON(Bukkit.spigot().getTuinityConfig(), null)),
+ pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null)), // Tuinity - add config to timings report
+ pair("tuinity", mapAsJSON(Bukkit.spigot().getTuinityConfig(), null)), // Tuinity - add config to timings report
+ pair("purpur.yml", mapAsJSON(Bukkit.spigot().getPurpurConfig(), null))
+ // Purpur end
));
new TimingsExport(listeners, parent, history).start();
@@ -247,6 +252,19 @@ class TimingsExport extends Thread {
@@ -248,6 +252,19 @@ class TimingsExport extends Thread {
return timingsCost;
}
@@ -51,20 +52,15 @@ index 93d5a3f9..b5111928 100644
JSONObject object = new JSONObject();
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 80f9abdc..739182ef 100644
index 55ec8d2d0..d85c215e4 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1371,6 +1371,23 @@ public interface Server extends PluginMessageRecipient {
@@ -1379,6 +1379,18 @@ public interface Server extends PluginMessageRecipient {
}
// Paper end
// Tuinity end - add config to timings report
+ // Purpur start
+ @NotNull
+ public org.bukkit.configuration.file.YamlConfiguration getTuinityConfig() {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @NotNull
+ public org.bukkit.configuration.file.YamlConfiguration getPurpurConfig() {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }

8
patches/api/0010-Add-tick-times-API.patch
View File

@@ -1,4 +1,4 @@
From 56c9dfec5e48c93e44bf73e8d841c851202320c2 Mon Sep 17 00:00:00 2001
From 8b372c69f358a53c1bb457358903de56bb174013 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 30 Jan 2020 00:41:08 -0600
Subject: [PATCH] Add tick times API
@@ -9,7 +9,7 @@ Subject: [PATCH] Add tick times API
2 files changed, 38 insertions(+)
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 3a60094a..6935cf27 100644
index 3a60094a1..6935cf272 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1664,4 +1664,25 @@ public final class Bukkit {
@@ -39,10 +39,10 @@ index 3a60094a..6935cf27 100644
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 0f7e84fb..df1765b5 100644
index 69a100a6b..e7166bcd4 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1470,4 +1470,21 @@ public interface Server extends PluginMessageRecipient {
@@ -1473,4 +1473,21 @@ public interface Server extends PluginMessageRecipient {
*/
int getCurrentTick();
// Paper end

8
patches/api/0011-Bring-back-server-name.patch
View File

@@ -1,4 +1,4 @@
From 33ce16852b951902d8a9685c5a65837796e94ebf Mon Sep 17 00:00:00 2001
From f2745516a51e9bf2765e629bdc036c3af1b5ebb9 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 26 May 2019 15:18:40 -0500
Subject: [PATCH] Bring back server name
@@ -9,7 +9,7 @@ Subject: [PATCH] Bring back server name
2 files changed, 16 insertions(+)
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 6935cf27..abf7caf0 100644
index 6935cf272..abf7caf0b 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1666,6 +1666,15 @@ public final class Bukkit {
@@ -29,10 +29,10 @@ index 6935cf27..abf7caf0 100644
* Get a sample of the servers last tick times (in nanos)
*
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index df1765b5..39d933aa 100644
index e7166bcd4..f6119933d 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1472,6 +1472,13 @@ public interface Server extends PluginMessageRecipient {
@@ -1475,6 +1475,13 @@ public interface Server extends PluginMessageRecipient {
// Paper end
// Purpur start

8
patches/api/0015-Implement-lagging-threshold.patch
View File

@@ -1,4 +1,4 @@
From 2ca955541330acf8eef7244843b91694407e881b Mon Sep 17 00:00:00 2001
From 9f6e4fe83868940e79f893f78c6e8ee5807ef9e9 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Tue, 23 Jul 2019 10:07:24 -0500
Subject: [PATCH] Implement lagging threshold
@@ -9,7 +9,7 @@ Subject: [PATCH] Implement lagging threshold
2 files changed, 16 insertions(+)
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index abf7caf0..c9fc59a2 100644
index abf7caf0b..c9fc59a2e 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1675,6 +1675,15 @@ public final class Bukkit {
@@ -29,10 +29,10 @@ index abf7caf0..c9fc59a2 100644
* Get a sample of the servers last tick times (in nanos)
*
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 39d933aa..eba6a7a7 100644
index f6119933d..c99ce2d89 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1479,6 +1479,13 @@ public interface Server extends PluginMessageRecipient {
@@ -1482,6 +1482,13 @@ public interface Server extends PluginMessageRecipient {
@NotNull
String getServerName();