Upstream
/
FastAsyncWorldedit
mirror of https://github.com/boy0001/FastAsyncWorldedit.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Prevent incompatibility with BetterShutdown

This commit is contained in:
Jesse Boyd 2018-05-02 09:03:00 +10:00
parent 03318369ae
commit 6839d5531f
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
bukkit/src/main/java/com/boydti/fawe/bukkit/BukkitMain.java
View File

@ -29,10 +29,12 @@ public class BukkitMain extends JavaPlugin {
pluginsField.set(manager, new ArrayList<Plugin>(plugins) {
@Override
public boolean add(Plugin plugin) {
if (!plugin.getName().startsWith("AsyncWorldEdit")) {
return super.add(plugin);
} else {
if (plugin.getName().startsWith("AsyncWorldEdit")) {
Fawe.debug("Disabling `" + plugin.getName() + "` as it is incompatible");
} else if (plugin.getName().startsWith("BetterShutdown")) {
Fawe.debug("Disabling `" + plugin.getName() + "` as it is incompatible (Improperly shaded classes from com.sk89q.minecraft.util.commands)");
} else {
return super.add(plugin);
}
return false;
}
@ -40,10 +42,11 @@ public class BukkitMain extends JavaPlugin {
lookupNamesField.set(manager, new ConcurrentHashMap<String, Plugin>(lookupNames) {
@Override
public Plugin put(String key, Plugin plugin) {
if (!plugin.getName().startsWith("AsyncWorldEdit")) {
return super.put(key, plugin);
if (plugin.getName().startsWith("AsyncWorldEdit") || plugin.getName().startsWith("BetterShutdown")) {
return null;
}
return null;
return super.put(key, plugin);
}
});
} catch (Throwable ignore) {}