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

upstream

Browse Source
This commit is contained in:
Ben Kerllenevich
2022-06-09 20:03:02 -04:00
parent 102b3130fe
commit 4f291c3b98
30 changed files with 89 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,10 +5,10 @@ Subject: [PATCH] Bring back server name
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index a87399fa4838d4b2c1ff9cc35d433ae76cc149bf..2d9a065aa8c6a835e49eee76acdf8cfa6af420bf 100644
index fc16e897f4ebaf9d79e49774e15a1cded33ef725..4e4d4931ec8d097f8b6162d56c9ec2eed8a982b4 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2368,4 +2368,15 @@ public final class Bukkit {
@@ -2381,4 +2381,15 @@ public final class Bukkit {
public static Server.Spigot spigot() {
return server.spigot();
}
@@ -25,10 +25,10 @@ index a87399fa4838d4b2c1ff9cc35d433ae76cc149bf..2d9a065aa8c6a835e49eee76acdf8cfa
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 30a1ba5ec7752a1771046072d00ed1718e6d0b84..0eb5c94458e7a87e6cf9d6332a0889286f96826e 100644
index 1895962c5ad0e9549cc90b0fa2861b7874d3e5aa..ca6ea0b03fb06f91712c68f7c84d8025908d65bf 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2067,4 +2067,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2077,4 +2077,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
@NotNull org.bukkit.potion.PotionBrewer getPotionBrewer();
// Paper end

8
patches/api/0012-Lagging-threshold.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Lagging threshold
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 2d9a065aa8c6a835e49eee76acdf8cfa6af420bf..cd7e04aa1de8f051ff4bb23f36912830ab573987 100644
index 4e4d4931ec8d097f8b6162d56c9ec2eed8a982b4..d9fca5c2d50b3d15c4719ebf5f92a56b00b28033 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2378,5 +2378,14 @@ public final class Bukkit {
@@ -2391,5 +2391,14 @@ public final class Bukkit {
public static String getServerName() {
return server.getServerName();
}
@@ -24,10 +24,10 @@ index 2d9a065aa8c6a835e49eee76acdf8cfa6af420bf..cd7e04aa1de8f051ff4bb23f36912830
// Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 0eb5c94458e7a87e6cf9d6332a0889286f96826e..cc026cbb487244851f8f58b763655a583c7b32e5 100644
index ca6ea0b03fb06f91712c68f7c84d8025908d65bf..4909c0ebf7d15d950eb18a5793590fac545a95bb 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2075,5 +2075,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2085,5 +2085,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
@NotNull
String getServerName();

8
patches/api/0039-Added-the-ability-to-add-combustible-items.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Added the ability to add combustible items
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index cd7e04aa1de8f051ff4bb23f36912830ab573987..419808643514cf894db69f2ed00283a760d8d8b8 100644
index d9fca5c2d50b3d15c4719ebf5f92a56b00b28033..44673fcec96a075bd02800b51318832d82b63c7e 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2387,5 +2387,24 @@ public final class Bukkit {
@@ -2400,5 +2400,24 @@ public final class Bukkit {
public static boolean isLagging() {
return server.isLagging();
}
@@ -34,10 +34,10 @@ index cd7e04aa1de8f051ff4bb23f36912830ab573987..419808643514cf894db69f2ed00283a7
// Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index cc026cbb487244851f8f58b763655a583c7b32e5..18376f615d5b00f6d41f006c5e0af7bd715e4364 100644
index 4909c0ebf7d15d950eb18a5793590fac545a95bb..72adbee17a6c5cb7f067fb4875ff39e4da3f8ef1 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2082,5 +2082,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2092,5 +2092,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
* @return True if lagging
*/
boolean isLagging();