mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-20 09:57:43 +01:00
merge upstream
This commit is contained in:
@@ -1,21 +1,23 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Ben Kerllenevich <ben@omega24.dev>
|
||||
Date: Thu, 2 Jun 2022 13:54:19 -0400
|
||||
Date: Wed, 8 Jun 2022 13:49:49 -0400
|
||||
Subject: [PATCH] Drop incompatible tests
|
||||
|
||||
|
||||
diff --git a/src/test/java/io/papermc/paper/permissions/MinecraftCommandPermissionsTest.java b/src/test/java/io/papermc/paper/permissions/MinecraftCommandPermissionsTest.java
|
||||
deleted file mode 100644
|
||||
index e80f8a32c82f89a2f898db1d869daadee735176f..0000000000000000000000000000000000000000
|
||||
index da2eb57ea64403657744ea00eff40243ef51df58..0000000000000000000000000000000000000000
|
||||
--- a/src/test/java/io/papermc/paper/permissions/MinecraftCommandPermissionsTest.java
|
||||
+++ /dev/null
|
||||
@@ -1,84 +0,0 @@
|
||||
@@ -1,86 +0,0 @@
|
||||
-package io.papermc.paper.permissions;
|
||||
-
|
||||
-import com.mojang.brigadier.tree.CommandNode;
|
||||
-import com.mojang.brigadier.tree.RootCommandNode;
|
||||
-import net.minecraft.commands.CommandBuildContext;
|
||||
-import net.minecraft.commands.CommandSourceStack;
|
||||
-import net.minecraft.commands.Commands;
|
||||
-import net.minecraft.core.RegistryAccess;
|
||||
-import net.minecraft.server.Bootstrap;
|
||||
-import org.bukkit.Bukkit;
|
||||
-import org.bukkit.craftbukkit.command.VanillaCommandWrapper;
|
||||
@@ -49,7 +51,7 @@ index e80f8a32c82f89a2f898db1d869daadee735176f..00000000000000000000000000000000
|
||||
- CraftDefaultPermissions.registerCorePermissions();
|
||||
- Set<String> perms = collectMinecraftCommandPerms();
|
||||
-
|
||||
- Commands commands = new Commands(Commands.CommandSelection.DEDICATED);
|
||||
- Commands commands = new Commands(Commands.CommandSelection.DEDICATED, new CommandBuildContext(RegistryAccess.BUILTIN.get()));
|
||||
- RootCommandNode<CommandSourceStack> root = commands.getDispatcher().getRoot();
|
||||
- Set<String> missing = new LinkedHashSet<>();
|
||||
- Set<String> foundPerms = new HashSet<>();
|
||||
|
||||
Reference in New Issue
Block a user