Upstream/LuckPerms
1
0
Fork 0
mirror of https://github.com/LuckPerms/LuckPerms.git synced 2024-11-27 21:29:47 +01:00
Code Issues Projects Releases Wiki Activity

Work around issue accessing PEX async in migration (#2102)

Browse Source
This commit is contained in:
Luck 2020-03-26 17:18:00 +00:00
parent 497846e5a6
commit 24304a61a7
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
1 changed files with 56 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
bukkit/src/main/java/me/lucko/luckperms/bukkit/migration/MigrationPermissionsEx.java
View File

@ -55,12 +55,14 @@ import net.luckperms.api.model.data.DataType;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import ru.tehkode.permissions.NativeInterface;
import ru.tehkode.permissions.PermissionEntity; import ru.tehkode.permissions.PermissionEntity;
import ru.tehkode.permissions.PermissionGroup; import ru.tehkode.permissions.PermissionGroup;
import ru.tehkode.permissions.PermissionManager; import ru.tehkode.permissions.PermissionManager;
import ru.tehkode.permissions.PermissionUser; import ru.tehkode.permissions.PermissionUser;
import ru.tehkode.permissions.PermissionsData; import ru.tehkode.permissions.PermissionsData;
import ru.tehkode.permissions.bukkit.PermissionsEx; import ru.tehkode.permissions.bukkit.PermissionsEx;
import ru.tehkode.permissions.events.PermissionEvent;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
@ -78,6 +80,7 @@ public class MigrationPermissionsEx extends ChildCommand<Object> {
private static final Method GET_DATA_METHOD; private static final Method GET_DATA_METHOD;
private static final Field TIMED_PERMISSIONS_FIELD; private static final Field TIMED_PERMISSIONS_FIELD;
private static final Field TIMED_PERMISSIONS_TIME_FIELD; private static final Field TIMED_PERMISSIONS_TIME_FIELD;
private static final Field NATIVE_INTERFACE_FIELD;
static { static {
try { try {
GET_DATA_METHOD = PermissionEntity.class.getDeclaredMethod("getData"); GET_DATA_METHOD = PermissionEntity.class.getDeclaredMethod("getData");
@ -88,6 +91,9 @@ public class MigrationPermissionsEx extends ChildCommand<Object> {
TIMED_PERMISSIONS_TIME_FIELD = PermissionEntity.class.getDeclaredField("timedPermissionsTime"); TIMED_PERMISSIONS_TIME_FIELD = PermissionEntity.class.getDeclaredField("timedPermissionsTime");
TIMED_PERMISSIONS_TIME_FIELD.setAccessible(true); TIMED_PERMISSIONS_TIME_FIELD.setAccessible(true);
NATIVE_INTERFACE_FIELD = PermissionManager.class.getDeclaredField("nativeI");
NATIVE_INTERFACE_FIELD.setAccessible(true);
} catch (NoSuchMethodException | NoSuchFieldException e) { } catch (NoSuchMethodException | NoSuchFieldException e) {
throw new ExceptionInInitializerError(e); throw new ExceptionInInitializerError(e);
} }
@ -113,6 +119,13 @@ public class MigrationPermissionsEx extends ChildCommand<Object> {
PermissionsEx pex = (PermissionsEx) Bukkit.getPluginManager().getPlugin("PermissionsEx"); PermissionsEx pex = (PermissionsEx) Bukkit.getPluginManager().getPlugin("PermissionsEx");
PermissionManager manager = pex.getPermissionsManager(); PermissionManager manager = pex.getPermissionsManager();
// hack to work around accessing pex async
try {
disablePexEvents(manager);
} catch (ReflectiveOperationException e) {
e.printStackTrace();
}
log.log("Calculating group weightings."); log.log("Calculating group weightings.");
int i = 0; int i = 0;
for (PermissionGroup group : manager.getGroupList()) { for (PermissionGroup group : manager.getGroupList()) {
@ -185,6 +198,13 @@ public class MigrationPermissionsEx extends ChildCommand<Object> {
log.logProgress("Migrated {} users so far.", userCount.incrementAndGet(), ProgressLogger.DEFAULT_NOTIFY_FREQUENCY); log.logProgress("Migrated {} users so far.", userCount.incrementAndGet(), ProgressLogger.DEFAULT_NOTIFY_FREQUENCY);
}); });
// re-enable events
try {
enablePexEvents(manager);
} catch (ReflectiveOperationException e) {
e.printStackTrace();
}
log.log("Migrated " + userCount.get() + " users."); log.log("Migrated " + userCount.get() + " users.");
log.log("Success! Migration complete."); log.log("Success! Migration complete.");
log.log("Don't forget to remove the PermissionsEx jar from your plugins folder & restart the server. " + log.log("Don't forget to remove the PermissionsEx jar from your plugins folder & restart the server. " +
@ -320,4 +340,40 @@ public class MigrationPermissionsEx extends ChildCommand<Object> {
} }
return world.toLowerCase(); return world.toLowerCase();
} }
/*
* Hack to workaround issue with accessing PEX async.
* See: https://github.com/lucko/LuckPerms/issues/2102
*/
private static void disablePexEvents(PermissionManager manager) throws ReflectiveOperationException {
NativeInterface nativeInterface = (NativeInterface) NATIVE_INTERFACE_FIELD.get(manager);
NATIVE_INTERFACE_FIELD.set(manager, new DisabledEventsNativeInterface(nativeInterface));
}
private static void enablePexEvents(PermissionManager manager) throws ReflectiveOperationException {
NativeInterface nativeInterface = (NativeInterface) NATIVE_INTERFACE_FIELD.get(manager);
while (nativeInterface instanceof DisabledEventsNativeInterface) {
nativeInterface = ((DisabledEventsNativeInterface) nativeInterface).delegate;
NATIVE_INTERFACE_FIELD.set(manager, nativeInterface);
}
}
private static final class DisabledEventsNativeInterface implements NativeInterface {
private final NativeInterface delegate;
private DisabledEventsNativeInterface(NativeInterface delegate) {
this.delegate = delegate;
}
@Override
public void callEvent(PermissionEvent permissionEvent) {
// do nothing!
}
@Override public String UUIDToName(UUID uuid) { return this.delegate.UUIDToName(uuid); }
@Override public UUID nameToUUID(String s) { return this.delegate.nameToUUID(s); }
@Override public boolean isOnline(UUID uuid) { return this.delegate.isOnline(uuid); }
@Override public UUID getServerUUID() { return this.delegate.getServerUUID(); }
}
} }