testserver/CraftBukkit-Patches/0163-Ability-to-disable-asy...

41 lines
1.5 KiB
Diff
Raw Normal View History

2014-06-22 20:55:54 +00:00
From 140459691f7ede67f6353b55bc4d0ea9e1000b1c Mon Sep 17 00:00:00 2001
2014-06-22 20:50:22 +00:00
From: Zach Brown <Zbob750@live.com>
Date: Sat, 14 Jun 2014 22:39:58 -0500
Subject: [PATCH] Ability to disable asynccatcher
diff --git a/src/main/java/org/spigotmc/AsyncCatcher.java b/src/main/java/org/spigotmc/AsyncCatcher.java
index 4b3aa85..4c78409 100644
--- a/src/main/java/org/spigotmc/AsyncCatcher.java
+++ b/src/main/java/org/spigotmc/AsyncCatcher.java
@@ -5,7 +5,7 @@ import net.minecraft.server.MinecraftServer;
public class AsyncCatcher
{
- public static boolean enabled = true;
+ public static boolean enabled = SpigotConfig.asyncCatcherFeature; // PaperSpigot - AsyncCatcher override feature
public static void catchOp(String reason)
{
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
2014-06-22 20:55:54 +00:00
index 1e30d4d..22f39bd 100644
2014-06-22 20:50:22 +00:00
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -324,4 +324,13 @@ public class SpigotConfig
{
intCacheLimit = getInt( "settings.int-cache-limit", 1024 );
}
+
+ public static boolean asyncCatcherFeature;
+ private static void asyncCatcherFeature()
+ {
+ asyncCatcherFeature = getBoolean( "settings.async-plugin-bad-magic-catcher", true );
+ if ( !asyncCatcherFeature ) {
+ Bukkit.getLogger().log( Level.INFO, "Disabling async plugin bad ju-ju catcher, this might be bad depending on your plugins" );
+ }
+ }
}
--
1.9.1