From 0320c185b534a014d02573b5c021b0061fec0ec1 Mon Sep 17 00:00:00 2001 From: JTK222 Date: Wed, 22 Dec 2021 14:22:16 +0100 Subject: [PATCH] Fixed incorrect generic in PermissionAPI (#8317) --- .../net/minecraftforge/server/permission/PermissionAPI.java | 4 ++-- src/test/java/net/minecraftforge/debug/PermissionTest.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/minecraftforge/server/permission/PermissionAPI.java b/src/main/java/net/minecraftforge/server/permission/PermissionAPI.java index 0fffc9b7e4..c39f1fe0ef 100644 --- a/src/main/java/net/minecraftforge/server/permission/PermissionAPI.java +++ b/src/main/java/net/minecraftforge/server/permission/PermissionAPI.java @@ -77,7 +77,7 @@ public final class PermissionAPI * PermissionNodes default handler. * @throws UnregisteredPermissionException when the PermissionNode wasn't registered properly */ - public static T getPermission(ServerPlayer player, PermissionNode node, PermissionDynamicContext... context) + public static T getPermission(ServerPlayer player, PermissionNode node, PermissionDynamicContext... context) { if (!activeHandler.getRegisteredNodes().contains(node)) throw new UnregisteredPermissionException(node); return activeHandler.getPermission(player, node, context); @@ -95,7 +95,7 @@ public final class PermissionAPI * PermissionNodes default handler. * @throws UnregisteredPermissionException when the PermissionNode wasn't registered properly */ - public static T getOfflinePermission(UUID player, PermissionNode node, PermissionDynamicContext... context) + public static T getOfflinePermission(UUID player, PermissionNode node, PermissionDynamicContext... context) { if (!activeHandler.getRegisteredNodes().contains(node)) throw new UnregisteredPermissionException(node); return activeHandler.getOfflinePermission(player, node, context); diff --git a/src/test/java/net/minecraftforge/debug/PermissionTest.java b/src/test/java/net/minecraftforge/debug/PermissionTest.java index ee47b7558f..33bdf41ed4 100644 --- a/src/test/java/net/minecraftforge/debug/PermissionTest.java +++ b/src/test/java/net/minecraftforge/debug/PermissionTest.java @@ -94,7 +94,7 @@ public class PermissionTest * Without that, the expected UnregisteredPermissionNode exception, triggers further exceptions and therefore isn't visible anymore. * This is only required to handle the intended error in the permission API, and should not be necessary with correct use. */ - private static boolean canUseCommand(CommandSourceStack src, PermissionNode booleanPermission, PermissionDynamicContext... context) + private static boolean canUseCommand(CommandSourceStack src, PermissionNode booleanPermission, PermissionDynamicContext... context) { try {