mirror of
https://github.com/YatopiaMC/Yatopia.git
synced 2024-11-26 12:45:52 +01:00
cc7670f815
Upstream/An Sidestream has released updates that appears to apply and compile correctly This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing. Tuinity Changes: de6c239 Merge branch 'master' of https://github.com/Spottedleaf/Tuinity into ver/1.16.4 cc34294 Copy passenger list in enderTeleportTo 8c5d945 Improve abnormal server shutdown process 0ae7e67 Do not load chunks during a crash report 0fbcf78 Fix small issue with handling of step height in colliding 4722d59 Updated Upstream (Paper) EMC Changes: 1d0cc885 Updated Paper Purpur Changes: 3776636 Implement TPSBar 258ae07 Updated Upstream (Paper) c51e391 Add back --zero-commit ef0b93d Rebuild patches 0ae637c Option for chests to open even with a solid block on top ce4ab83 Phantom flames on swoop 5e2d697 Don't apply potion effects on load either bbe5a58 Don't apply potion effect to wolves during worldgen 06c4f83 Get max health attribute even closer to vanilla 41f23a7 Updated Upstream (Tuinity) 787e35c Get max health equations for horse types closer to vanilla aed0867 Fix CraftSound backwards compatibility dfabf51 Start of the configurable base attributes a1fa221 Updated Upstream (Paper) 0174fcd Configurable default wolf collar color (#116) da48e0a [ci-skip] fix comment in last patch 65fde28 Add option for using milk to cure wolves 38efb4d Use a ThreadLocal SimpleDateFormat for CriterionProgress deserialization 4e6e1ff Revert "Fix concurrency issue with CriterionProgress deserialization" 55bde37 Fix concurrency issue with CriterionProgress deserialization b4be9ab Small fixes to rabid wolves patch 5943978 Updated Upstream (Paper) ac34692 Chance to spawn wolves as "rabid" (#114) 1b40f87 Updated Upstream (Paper) 69790ff Alphabetize in-game /plugins list AirplaneLite Changes: 76810f1 Updated Upstream (Tuinity)
105 lines
3.4 KiB
Diff
105 lines
3.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: YatopiaMC <yatopiamc@gmail.com>
|
|
Date: Sat, 1 Aug 2020 15:51:06 -0500
|
|
Subject: [PATCH] Yatopia API Bundle
|
|
|
|
Lagging threshold + Purpur & Rainforest & Origami config
|
|
|
|
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
|
index fecd7b14d317f55eb1ce7b5c6af9913917971427..6df897ed32a94df4a06e1d5ac3d749e6a360ab2f 100644
|
|
--- a/src/main/java/org/bukkit/Bukkit.java
|
|
+++ b/src/main/java/org/bukkit/Bukkit.java
|
|
@@ -1817,4 +1817,15 @@ public final class Bukkit {
|
|
public static Server.Spigot spigot() {
|
|
return server.spigot();
|
|
}
|
|
+
|
|
+ // Purpur start
|
|
+ /**
|
|
+ * Check if the server is lagging, according to the laggy threshold setting.
|
|
+ *
|
|
+ * @return true if lagging
|
|
+ */
|
|
+ public static boolean isLagging() {
|
|
+ return server.isLagging();
|
|
+ }
|
|
+ // Purpur end
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
|
index b45ad8df8b7a44c9e6d12326e5ea85e8d166a16c..40d342ef1a618b7d85731b238b0344402e551251 100644
|
|
--- a/src/main/java/org/bukkit/Server.java
|
|
+++ b/src/main/java/org/bukkit/Server.java
|
|
@@ -1490,6 +1490,58 @@ public interface Server extends PluginMessageRecipient {
|
|
}
|
|
// Tuinity end - add config to timings report
|
|
|
|
+ // Akarin start
|
|
+ /**
|
|
+ * @deprecated yatopia does not import akarin config anymore
|
|
+ */
|
|
+ @Deprecated
|
|
+ @NotNull
|
|
+ public org.bukkit.configuration.file.YamlConfiguration getAkarinConfig()
|
|
+ {
|
|
+ return new org.bukkit.configuration.file.YamlConfiguration();
|
|
+ }
|
|
+ // Akarin end
|
|
+
|
|
+ // Rainforest start
|
|
+ /**
|
|
+ * @deprecated yatopia does not import akarin config anymore
|
|
+ */
|
|
+ @Deprecated
|
|
+ @NotNull
|
|
+ public org.bukkit.configuration.file.YamlConfiguration getRainforestConfig()
|
|
+ {
|
|
+ return new org.bukkit.configuration.file.YamlConfiguration();
|
|
+ }
|
|
+ // Rainforest end
|
|
+
|
|
+ // Purpur start
|
|
+ @NotNull
|
|
+ public org.bukkit.configuration.file.YamlConfiguration getPurpurConfig()
|
|
+ {
|
|
+ throw new UnsupportedOperationException("Not supported yet.");
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ public java.util.Properties getServerProperties()
|
|
+ {
|
|
+ throw new UnsupportedOperationException("Not supported yet.");
|
|
+ }
|
|
+ // Purpur end
|
|
+ // Origami start - add config to timings report
|
|
+ @NotNull
|
|
+ public org.bukkit.configuration.file.YamlConfiguration getOrigamiConfig()
|
|
+ {
|
|
+ throw new UnsupportedOperationException("Not supported yet.");
|
|
+ }
|
|
+ // Origami end
|
|
+ // Yatopia start - add config to timings report
|
|
+ @NotNull
|
|
+ public org.bukkit.configuration.file.YamlConfiguration getYatopiaConfig()
|
|
+ {
|
|
+ throw new UnsupportedOperationException("Not supported yet.");
|
|
+ }
|
|
+ // Yatopia end
|
|
+
|
|
/**
|
|
* Sends the component to the player
|
|
*
|
|
@@ -1590,4 +1642,13 @@ public interface Server extends PluginMessageRecipient {
|
|
@NotNull
|
|
com.destroystokyo.paper.entity.ai.MobGoals getMobGoals();
|
|
// Paper end
|
|
+
|
|
+ // Purpur start
|
|
+ /**
|
|
+ * Check if the server is lagging, according to the laggy threshold setting.
|
|
+ *
|
|
+ * @return true if lagging
|
|
+ */
|
|
+ boolean isLagging();
|
|
+ // Purpur end
|
|
}
|