Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2024-10-02 00:27:31 +02:00
Code Issues Projects Releases Wiki Activity

Revert to fix Java 11 compatibility.

Browse Source 
dfe7fc27e5 (commitcomment-32081178)
This commit is contained in:
tastybento 2019-01-27 09:17:54 -08:00
parent 873c12fe70
commit 0280303058
1 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/main/java/world/bentobox/bentobox/api/addons/AddonClassLoader.java
View File

@ -15,9 +15,8 @@ import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.permissions.PermissionDefault;
import org.bukkit.plugin.InvalidDescriptionException;
import org.bukkit.util.permissions.DefaultPermissions;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
import world.bentobox.bentobox.api.addons.exceptions.InvalidAddonFormatException;
import world.bentobox.bentobox.api.addons.exceptions.InvalidAddonInheritException;
import world.bentobox.bentobox.managers.AddonsManager;
@ -109,33 +108,35 @@ public class AddonClassLoader extends URLClassLoader {
/**
* This is a custom findClass that enables classes in other addons to be found
* @param name class name
* @param checkGlobal check globally or not when searching
* @return class if found, null otherwise
* @param name - class name
* @param checkGlobal - check globally or not when searching
* @return Class - class if found
*/
@Nullable
public Class<?> findClass(@NonNull String name, boolean checkGlobal) {
public Class<?> findClass(String name, boolean checkGlobal) {
if (name.startsWith("world.bentobox.bentobox")) {
return null;
}
Class<?> result = classes.get(name);
if (result == null) {
if (checkGlobal) {
result = loader.getClassByName(name);
}
// Either return the value if it exists (and != null), or try to compute one.
// If the computed value is null, it won't be added to the map.
return classes.computeIfAbsent(name, (key) -> {
Class<?> computed = checkGlobal ? loader.getClassByName(key) : null;
if (computed == null) {
if (result == null) {
try {
computed = super.findClass(key);
result = super.findClass(name);
} catch (ClassNotFoundException | NoClassDefFoundError e) {
// Do nothing.
result = null;
}
if (computed != null) {
loader.setClass(key, computed);
if (result != null) {
loader.setClass(name, result);
}
}
return computed;
});
classes.put(name, result);
}
return result;
}
/**
@ -144,4 +145,5 @@ public class AddonClassLoader extends URLClassLoader {
public Addon getAddon() {
return addon;
}
}