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

cursed rebase

Browse Source
This commit is contained in:
Ben Kerllenevich
2021-12-05 09:59:34 -05:00
parent 8336433ff1
commit 7fe89b5a84
167 changed files with 743 additions and 850 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/api/0042-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 4ef8c75df64e670c55f13efaa69651fd636d5f12..c98794dff18890fc2fe964238e06c0e20e58750f 100644
index fbef0ab6514f9a2ab1e48e9f973992221ab09552..5bfdc308b5133c0cbe7cccfa26bd2135ccd4603b 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2139,5 +2139,24 @@ public final class Bukkit {
@@ -2157,5 +2157,24 @@ public final class Bukkit {
public static boolean isLagging() {
return server.isLagging();
}
@@ -34,10 +34,10 @@ index 4ef8c75df64e670c55f13efaa69651fd636d5f12..c98794dff18890fc2fe964238e06c0e2
// Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index c641822847c8f5c3753fa5a4ea97d86fa44b1fa0..f3b6ba687e3d96fbee592465977df29338dd9a27 100644
index 7fa99fadfe5558fddf2aeef51ca824a59a55f7d4..d8cf62e42dcff4414dcd5c1979a89a32a975da44 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1867,5 +1867,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1883,5 +1883,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
* @return True if lagging
*/
boolean isLagging();