Remove 1.7 support

This commit is contained in:
Gabriele C
2018-11-30 09:23:30 +01:00
parent fdcbb3334e
commit c11e4b9f15
16 changed files with 45 additions and 379 deletions
@@ -455,11 +455,7 @@ public class PermissionsManager implements Reloadable {
*/
public boolean loadUserData(OfflinePlayer offlinePlayer) {
try {
try {
loadUserData(offlinePlayer.getUniqueId());
} catch (NoSuchMethodError e) {
loadUserData(offlinePlayer.getName());
}
loadUserData(offlinePlayer.getUniqueId());
} catch (PermissionLoadUserException e) {
ConsoleLogger.logException("Unable to load the permission data of user " + offlinePlayer.getName(), e);
return false;
@@ -480,16 +476,4 @@ public class PermissionsManager implements Reloadable {
handler.loadUserData(uuid);
}
/**
* Loads the permission data of the given player name.
*
* @param name the name of the player.
* @throws PermissionLoadUserException if the action failed.
*/
public void loadUserData(String name) throws PermissionLoadUserException {
if (!isEnabled()) {
return;
}
handler.loadUserData(name);
}
}
@@ -197,13 +197,4 @@ public class LuckPermsHandler implements PermissionHandler {
}
}
@Override
public void loadUserData(String name) throws PermissionLoadUserException {
try {
UUID uuid = luckPermsApi.getUserManager().lookupUuid(name).get(5, TimeUnit.SECONDS);
loadUserData(uuid);
} catch (InterruptedException | ExecutionException | TimeoutException e) {
throw new PermissionLoadUserException("Unable to load the permission data of the user " + name, e);
}
}
}
@@ -110,6 +110,4 @@ public interface PermissionHandler {
default void loadUserData(UUID uuid) throws PermissionLoadUserException {
}
default void loadUserData(String name) throws PermissionLoadUserException {
}
}