Skip to content

Commit 4f1d58d

Browse files
authored
Revert "Fix LimboAPI login injection on Velocity-CTD (DEFAULT_PERMISSION_RESO…" (#239)
This reverts commit 1de2601. #236 (comment)
1 parent 5001208 commit 4f1d58d

1 file changed

Lines changed: 3 additions & 13 deletions

File tree

plugin/src/main/java/net/elytrium/limboapi/injection/login/LoginTasksQueue.java

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -292,19 +292,9 @@ private void connectToServer(Logger logger, ConnectedPlayer player, MinecraftCon
292292
PROFILE_FIELD = MethodHandles.privateLookupIn(ConnectedPlayer.class, MethodHandles.lookup())
293293
.findSetter(ConnectedPlayer.class, "profile", GameProfile.class);
294294

295-
PermissionProvider defaultPermissions;
296-
try {
297-
Field defaultPermissionsField = ConnectedPlayer.class.getDeclaredField("DEFAULT_PERMISSIONS");
298-
defaultPermissionsField.setAccessible(true);
299-
defaultPermissions = (PermissionProvider) defaultPermissionsField.get(null);
300-
} catch (NoSuchFieldException e) {
301-
Field defaultPermissionResolverField = ConnectedPlayer.class.getDeclaredField("DEFAULT_PERMISSION_RESOLVER");
302-
defaultPermissionResolverField.setAccessible(true);
303-
PermissionFunction defaultResolver = (PermissionFunction) defaultPermissionResolverField.get(null);
304-
// Velocity-CTD does not expose DEFAULT_PERMISSIONS; adapt its resolver to the PermissionProvider contract.
305-
defaultPermissions = subject -> (PermissionFunction) defaultResolver;
306-
}
307-
DEFAULT_PERMISSIONS = defaultPermissions;
295+
Field defaultPermissionsField = ConnectedPlayer.class.getDeclaredField("DEFAULT_PERMISSIONS");
296+
defaultPermissionsField.setAccessible(true);
297+
DEFAULT_PERMISSIONS = (PermissionProvider) defaultPermissionsField.get(null);
308298

309299
SET_PERMISSION_FUNCTION_METHOD = MethodHandles.privateLookupIn(ConnectedPlayer.class, MethodHandles.lookup())
310300
.findVirtual(ConnectedPlayer.class, "setPermissionFunction", MethodType.methodType(void.class, PermissionFunction.class));

0 commit comments

Comments
 (0)