Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2024-11-28 13:45:14 +01:00
Code Issues Projects Releases Wiki Activity

Removed code smells.

Browse Source
This commit is contained in:
tastybento 2018-08-03 23:31:02 -07:00
parent 5c46265771
commit 93c3d3ce47
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/world/bentobox/bentobox/Constants.java
View File

@ -5,6 +5,9 @@ package world.bentobox.bentobox;
* @author tastybento * @author tastybento
*/ */
public class Constants { public class Constants {
private Constants() {}
// The spawn command (Essentials spawn for example) // The spawn command (Essentials spawn for example)
public static final String SPAWNCOMMAND = "spawn"; public static final String SPAWNCOMMAND = "spawn";
} }

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

@ -103,26 +103,24 @@ public class AddonClassLoader extends URLClassLoader {
* @return Class - class if found * @return Class - class if found
*/ */
public Class<?> findClass(String name, boolean checkGlobal) { public Class<?> findClass(String name, boolean checkGlobal) {
if (name.startsWith("us.tastybento.")) { if (name.startsWith("world.bentobox.")) {
return null; return null;
} }
Class<?> result = classes.get(name);
if (result == null) { Class<?> result = classes.computeIfAbsent(name, k -> {
if (checkGlobal) { if (checkGlobal && loader.getClassByName(name) != null) {
result = loader.getClassByName(name); return loader.getClassByName(name);
} } else {
if (result == null) {
try { try {
result = super.findClass(name); return super.findClass(name);
} catch (ClassNotFoundException e) { } catch (ClassNotFoundException e) {
return null; return null;
} }
}
});
if (result != null) { if (result != null) {
loader.setClass(name, result); loader.setClass(name, result);
} }
classes.put(name, result);
}
}
return result; return result;
} }