diff --git a/patches/server/0064-Add-ping-command.patch b/patches/server/0064-Add-ping-command.patch index b5a3a4ade..7618bfee7 100644 --- a/patches/server/0064-Add-ping-command.patch +++ b/patches/server/0064-Add-ping-command.patch @@ -37,10 +37,10 @@ index 01ac09bda83703c16aed64133096377d7113693e..27b35e12eafd3ee735fcea201c9d371c public static String serverModName = "Purpur"; diff --git a/src/main/java/org/purpurmc/purpur/command/PingCommand.java b/src/main/java/org/purpurmc/purpur/command/PingCommand.java new file mode 100644 -index 0000000000000000000000000000000000000000..5e89694a7f01d9b09c7f75745f8faa4c5748c173 +index 0000000000000000000000000000000000000000..179727c6b3171c040d1aaf069525f61a9a2d54d9 --- /dev/null +++ b/src/main/java/org/purpurmc/purpur/command/PingCommand.java -@@ -0,0 +1,32 @@ +@@ -0,0 +1,33 @@ +package org.purpurmc.purpur.command; + +import com.mojang.brigadier.CommandDispatcher; @@ -60,6 +60,7 @@ index 0000000000000000000000000000000000000000..5e89694a7f01d9b09c7f75745f8faa4c + .requires((listener) -> listener.hasPermission(2, "bukkit.command.ping")) + .executes((context) -> execute(context.getSource(), Collections.singleton(context.getSource().getPlayerOrException()))) + .then(Commands.argument("targets", EntityArgument.players()) ++ .requires(listener -> listener.hasPermission(2, "bukkit.command.ping.other")) + .executes((context) -> execute(context.getSource(), EntityArgument.getPlayers(context, "targets"))) + ) + ); diff --git a/patches/server/0065-Add-demo-command.patch b/patches/server/0065-Add-demo-command.patch index ab388a7e9..3c5f86093 100644 --- a/patches/server/0065-Add-demo-command.patch +++ b/patches/server/0065-Add-demo-command.patch @@ -38,10 +38,10 @@ index 27b35e12eafd3ee735fcea201c9d371c2480e4da..fdcffdc618fcbc2413f6e6949d82ed1f diff --git a/src/main/java/org/purpurmc/purpur/command/DemoCommand.java b/src/main/java/org/purpurmc/purpur/command/DemoCommand.java new file mode 100644 -index 0000000000000000000000000000000000000000..cb76bb1345738084e4f5797229fd04bd65e8e0f6 +index 0000000000000000000000000000000000000000..235f3cd89f675b70a6152a00534608c0902f19fd --- /dev/null +++ b/src/main/java/org/purpurmc/purpur/command/DemoCommand.java -@@ -0,0 +1,34 @@ +@@ -0,0 +1,35 @@ +package org.purpurmc.purpur.command; + +import com.mojang.brigadier.CommandDispatcher; @@ -61,6 +61,7 @@ index 0000000000000000000000000000000000000000..cb76bb1345738084e4f5797229fd04bd + .requires((listener) -> listener.hasPermission(2, "bukkit.command.demo")) + .executes((context) -> execute(context.getSource(), Collections.singleton(context.getSource().getPlayerOrException()))) + .then(Commands.argument("targets", EntityArgument.players()) ++ .requires(listener -> listener.hasPermission(2, "bukkit.command.demo.other")) + .executes((context) -> execute(context.getSource(), EntityArgument.getPlayers(context, "targets"))) + ) + ); diff --git a/patches/server/0066-Add-credits-command.patch b/patches/server/0066-Add-credits-command.patch index b14fa9d43..66ffcd236 100644 --- a/patches/server/0066-Add-credits-command.patch +++ b/patches/server/0066-Add-credits-command.patch @@ -38,10 +38,10 @@ index fdcffdc618fcbc2413f6e6949d82ed1f138086b1..28711abdabec6894faefb3a5bcff503c } diff --git a/src/main/java/org/purpurmc/purpur/command/CreditsCommand.java b/src/main/java/org/purpurmc/purpur/command/CreditsCommand.java new file mode 100644 -index 0000000000000000000000000000000000000000..8ea09a5154a566b310648ebc32f6840c510a4eba +index 0000000000000000000000000000000000000000..40d2fab4a9728ac90c36e30c130f3116b7025d11 --- /dev/null +++ b/src/main/java/org/purpurmc/purpur/command/CreditsCommand.java -@@ -0,0 +1,34 @@ +@@ -0,0 +1,35 @@ +package org.purpurmc.purpur.command; + +import com.mojang.brigadier.CommandDispatcher; @@ -61,6 +61,7 @@ index 0000000000000000000000000000000000000000..8ea09a5154a566b310648ebc32f6840c + .requires((listener) -> listener.hasPermission(2, "bukkit.command.credits")) + .executes((context) -> execute(context.getSource(), Collections.singleton(context.getSource().getPlayerOrException()))) + .then(Commands.argument("targets", EntityArgument.players()) ++ .requires(listener -> listener.hasPermission(2, "bukkit.command.credits.other")) + .executes((context) -> execute(context.getSource(), EntityArgument.getPlayers(context, "targets"))) + ) + ); diff --git a/patches/server/0120-Implement-TPSBar.patch b/patches/server/0120-Implement-TPSBar.patch index 9aa4a7229..5071bafc8 100644 --- a/patches/server/0120-Implement-TPSBar.patch +++ b/patches/server/0120-Implement-TPSBar.patch @@ -156,10 +156,10 @@ index 126eb32d182b78b07add872aad6a821334639662..5b0625955e2a65f689c8a128d73170bc public static boolean enderChestPermissionRows = false; diff --git a/src/main/java/org/purpurmc/purpur/command/TPSBarCommand.java b/src/main/java/org/purpurmc/purpur/command/TPSBarCommand.java new file mode 100644 -index 0000000000000000000000000000000000000000..1ac51b238569bb825f8b3f7696164492c536ff76 +index 0000000000000000000000000000000000000000..d8f9b044107ff7c29a83eb5378aa9f5465ba1995 --- /dev/null +++ b/src/main/java/org/purpurmc/purpur/command/TPSBarCommand.java -@@ -0,0 +1,43 @@ +@@ -0,0 +1,44 @@ +package org.purpurmc.purpur.command; + +import com.mojang.brigadier.CommandDispatcher; @@ -183,6 +183,7 @@ index 0000000000000000000000000000000000000000..1ac51b238569bb825f8b3f7696164492 + .requires(listener -> listener.hasPermission(2, "bukkit.command.tpsbar")) + .executes(context -> execute(context.getSource(), Collections.singleton(context.getSource().getPlayerOrException()))) + .then(Commands.argument("targets", EntityArgument.players()) ++ .requires(listener -> listener.hasPermission(2, "bukkit.command.tpsbar.other")) + .executes((context) -> execute(context.getSource(), EntityArgument.getPlayers(context, "targets"))) + ) + ); diff --git a/patches/server/0285-Implement-ram-and-rambar-commands.patch b/patches/server/0285-Implement-ram-and-rambar-commands.patch index e62c891d6..b04672c45 100644 --- a/patches/server/0285-Implement-ram-and-rambar-commands.patch +++ b/patches/server/0285-Implement-ram-and-rambar-commands.patch @@ -117,10 +117,10 @@ index 2de8d543def43b39007c672f783539ca7671e7cb..ebfd0b9c713df5074ac47b2cb94cee35 commandTPSBarProgressFillMode = TPSBarTask.FillMode.valueOf(getString("settings.command.tpsbar.fill-mode", commandTPSBarProgressFillMode.name())); diff --git a/src/main/java/org/purpurmc/purpur/command/RamBarCommand.java b/src/main/java/org/purpurmc/purpur/command/RamBarCommand.java new file mode 100644 -index 0000000000000000000000000000000000000000..c68bb8a1f7a71bea37626188189a5b689b5f2099 +index 0000000000000000000000000000000000000000..2852c07adb080c34905f5d1b19efed8ea47eecc6 --- /dev/null +++ b/src/main/java/org/purpurmc/purpur/command/RamBarCommand.java -@@ -0,0 +1,43 @@ +@@ -0,0 +1,44 @@ +package org.purpurmc.purpur.command; + +import com.mojang.brigadier.CommandDispatcher; @@ -144,6 +144,7 @@ index 0000000000000000000000000000000000000000..c68bb8a1f7a71bea37626188189a5b68 + .requires(listener -> listener.hasPermission(2, "bukkit.command.rambar")) + .executes(context -> execute(context.getSource(), Collections.singleton(context.getSource().getPlayerOrException()))) + .then(Commands.argument("targets", EntityArgument.players()) ++ .requires(listener -> listener.hasPermission(2, "bukkit.command.rambar.other")) + .executes((context) -> execute(context.getSource(), EntityArgument.getPlayers(context, "targets"))) + ) + );