|
41 | 41 | import ch.njol.skript.util.chat.ChatMessages;
|
42 | 42 | import ch.njol.skript.util.chat.LinkParseMode;
|
43 | 43 | import ch.njol.skript.variables.Variables;
|
| 44 | +import co.aikar.timings.Timings; |
44 | 45 | import org.bukkit.event.EventPriority;
|
45 | 46 | import org.eclipse.jdt.annotation.Nullable;
|
46 | 47 |
|
@@ -196,15 +197,22 @@ public static String formatDate(final long timestamp) {
|
196 | 197 |
|
197 | 198 | public static final Option<Boolean> enableTimings = new Option<>("enable timings", false)
|
198 | 199 | .setter(t -> {
|
199 |
| - if (Skript.classExists("co.aikar.timings.Timings")) { // Check for Paper server |
200 |
| - if (t) |
201 |
| - Skript.info("Timings support enabled!"); |
202 |
| - SkriptTimings.setEnabled(t); // Config option will be used |
203 |
| - } else { // Not running Paper |
| 200 | + if (!Skript.classExists("co.aikar.timings.Timings")) { // Check for Timings |
204 | 201 | if (t) // Warn the server admin that timings won't work
|
205 | 202 | Skript.warning("Timings cannot be enabled! You are running Bukkit/Spigot, but Paper is required.");
|
206 | 203 | SkriptTimings.setEnabled(false); // Just to be sure, deactivate timings support completely
|
| 204 | + return; |
207 | 205 | }
|
| 206 | + if (Timings.class.isAnnotationPresent(Deprecated.class)) { // check for deprecated Timings |
| 207 | + if (t) // Warn the server admin that timings won't work |
| 208 | + Skript.warning("Timings cannot be enabled! Paper no longer supports Timings as of 1.19.4."); |
| 209 | + SkriptTimings.setEnabled(false); // Just to be sure, deactivate timings support completely |
| 210 | + return; |
| 211 | + } |
| 212 | + // If we get here, we can safely enable timings |
| 213 | + if (t) |
| 214 | + Skript.info("Timings support enabled!"); |
| 215 | + SkriptTimings.setEnabled(t); // Config option will be used |
208 | 216 | });
|
209 | 217 |
|
210 | 218 | public static final Option<String> parseLinks = new Option<>("parse links in chat messages", "disabled")
|
|
0 commit comments