diff --git a/patches/server/0237-Skip-junit-tests-for-purpur-commands.patch b/purpur-server/paper-patches/files/src/test/java/io/papermc/paper/permissions/MinecraftCommandPermissionsTest.java.patch similarity index 68% rename from patches/server/0237-Skip-junit-tests-for-purpur-commands.patch rename to purpur-server/paper-patches/files/src/test/java/io/papermc/paper/permissions/MinecraftCommandPermissionsTest.java.patch index d7d2fd0a0..6fb471079 100644 --- a/patches/server/0237-Skip-junit-tests-for-purpur-commands.patch +++ b/purpur-server/paper-patches/files/src/test/java/io/papermc/paper/permissions/MinecraftCommandPermissionsTest.java.patch @@ -1,26 +1,18 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: BillyGalbreath -Date: Thu, 8 Dec 2022 19:13:26 -0600 -Subject: [PATCH] Skip junit tests for purpur commands - - -diff --git a/src/test/java/io/papermc/paper/permissions/MinecraftCommandPermissionsTest.java b/src/test/java/io/papermc/paper/permissions/MinecraftCommandPermissionsTest.java -index 75ed5050f72c001d6eab117a2c0b352a413548bd..180c0a532bbac10a8280b63eb7aa783a1bfbb237 100644 --- a/src/test/java/io/papermc/paper/permissions/MinecraftCommandPermissionsTest.java +++ b/src/test/java/io/papermc/paper/permissions/MinecraftCommandPermissionsTest.java -@@ -46,6 +46,7 @@ public class MinecraftCommandPermissionsTest { +@@ -46,6 +_,7 @@ Set foundPerms = new HashSet<>(); for (CommandNode child : root.getChildren()) { final String vanillaPerm = VanillaCommandWrapper.getPermission(child); -+ if (TO_SKIP.contains(vanillaPerm)) continue; // Purpur ++ if (TO_SKIP.contains(vanillaPerm)) continue; // Purpur - Skip junit tests for purpur commands if (!perms.contains(vanillaPerm)) { missing.add("Missing permission for " + child.getName() + " (" + vanillaPerm + ") command"); } else { -@@ -58,6 +59,25 @@ public class MinecraftCommandPermissionsTest { +@@ -58,6 +_,25 @@ } private static final List TO_SKIP = List.of( -+ // Purpur start ++ // Purpur start - Skip junit tests for purpur commands + "minecraft.command.compass", + "minecraft.command.credits", + "minecraft.command.demo", @@ -38,7 +30,7 @@ index 75ed5050f72c001d6eab117a2c0b352a413548bd..180c0a532bbac10a8280b63eb7aa783a + "minecraft.command.gamemode.spectator.other", + "minecraft.command.gamemode.survival", + "minecraft.command.gamemode.survival.other", -+ // Purpur end ++ // Purpur end - Skip junit tests for purpur commands "minecraft.command.selector" );