7b0c576798
Allows us much greater control over the Spigot portion of the code and makes us more "proper" Credit to @Dmck2b for originally passing the idea along a while back
45 lines
1.7 KiB
Diff
45 lines
1.7 KiB
Diff
From 32f83c3e5e184f422e20a900d6fa2403b14f537b Mon Sep 17 00:00:00 2001
|
|
From: Zach Brown <Zbob750@live.com>
|
|
Date: Sat, 12 Jul 2014 19:37:16 -0500
|
|
Subject: [PATCH] Ability to disable asynccatcher
|
|
|
|
|
|
diff --git a/src/main/java/org/github/paperspigot/PaperSpigotConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotConfig.java
|
|
index e296da2..f7dc787 100644
|
|
--- a/src/main/java/org/github/paperspigot/PaperSpigotConfig.java
|
|
+++ b/src/main/java/org/github/paperspigot/PaperSpigotConfig.java
|
|
@@ -131,4 +131,13 @@ public class PaperSpigotConfig
|
|
config.addDefault( path, def );
|
|
return config.getString( path, config.getString( path ) );
|
|
}
|
|
+
|
|
+ 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" );
|
|
+ }
|
|
+ }
|
|
}
|
|
diff --git a/src/main/java/org/spigotmc/AsyncCatcher.java b/src/main/java/org/spigotmc/AsyncCatcher.java
|
|
index 4b3aa85..c4312db 100644
|
|
--- a/src/main/java/org/spigotmc/AsyncCatcher.java
|
|
+++ b/src/main/java/org/spigotmc/AsyncCatcher.java
|
|
@@ -1,11 +1,12 @@
|
|
package org.spigotmc;
|
|
|
|
import net.minecraft.server.MinecraftServer;
|
|
+import org.github.paperspigot.PaperSpigotConfig; // PaperSpigot
|
|
|
|
public class AsyncCatcher
|
|
{
|
|
|
|
- public static boolean enabled = true;
|
|
+ public static boolean enabled = PaperSpigotConfig.asyncCatcherFeature; // PaperSpigot - AsyncCatcher override feature
|
|
|
|
public static void catchOp(String reason)
|
|
{
|
|
--
|
|
1.9.1
|
|
|