worldofcraft/LuckPerms-DBA
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cleanup duplicated method

Browse Source
This commit is contained in:
Luck 2017-04-20 19:26:47 +01:00
parent 867ba24c6c
commit 3d54f832c5
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
1 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
bukkit/src/main/java/me/lucko/luckperms/bukkit/model/Injector.java
View File

@ -27,7 +27,8 @@ package me.lucko.luckperms.bukkit.model;
import lombok.experimental.UtilityClass; import lombok.experimental.UtilityClass;
import org.bukkit.Bukkit; import me.lucko.luckperms.bukkit.compat.ReflectionUtil;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.permissions.PermissibleBase; import org.bukkit.permissions.PermissibleBase;
import org.bukkit.permissions.PermissionAttachment; import org.bukkit.permissions.PermissionAttachment;
@ -54,7 +55,7 @@ public class Injector {
try { try {
try { try {
// craftbukkit // craftbukkit
humanEntityField = Class.forName(getVersionedClassName("entity.CraftHumanEntity")).getDeclaredField("perm"); humanEntityField = ReflectionUtil.obcClass("entity.CraftHumanEntity").getDeclaredField("perm");
humanEntityField.setAccessible(true); humanEntityField.setAccessible(true);
} catch (Exception e) { } catch (Exception e) {
// glowstone // glowstone
@ -153,22 +154,4 @@ public class Injector {
return INJECTED_PERMISSIBLES.get(uuid); return INJECTED_PERMISSIBLES.get(uuid);
} }
private static String getVersionedClassName(String className) throws ClassNotFoundException {
Class server = Bukkit.getServer().getClass();
if (!server.getSimpleName().equals("CraftServer")) {
throw new ClassNotFoundException("Couldn't inject into server " + server);
}
String version;
if (server.getName().equals("org.bukkit.craftbukkit.CraftServer")) {
// Non versioned class
version = ".";
} else {
version = server.getName().substring("org.bukkit.craftbukkit".length());
version = version.substring(0, version.length() - "CraftServer".length());
}
return "org.bukkit.craftbukkit" + version + className;
}
} }