From c8f10a6dc717f7c6fdcda18272dd81d3581c9b76 Mon Sep 17 00:00:00 2001 From: Telesphoreo Date: Mon, 3 Jan 2022 15:14:12 -0600 Subject: [PATCH] Fix ops being able to use /give ** --- Essentials/build.gradle | 2 +- .../earth2me/essentials/commands/EssentialsLoopCommand.java | 3 ++- settings.gradle.kts | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Essentials/build.gradle b/Essentials/build.gradle index b89ee851a..0ac7e12d0 100644 --- a/Essentials/build.gradle +++ b/Essentials/build.gradle @@ -7,7 +7,7 @@ dependencies { exclude group: "org.bukkit", module: "bukkit" } compileOnly 'net.luckperms:api:5.0' - compileOnly 'me.totalfreedom:TotalFreedomMod:7.1.0' + compileOnly 'me.telesphoreo:DummyTFM:1.0' api 'io.papermc:paperlib:1.0.6' diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/EssentialsLoopCommand.java b/Essentials/src/main/java/com/earth2me/essentials/commands/EssentialsLoopCommand.java index 5d6619245..da0e8b4d2 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/commands/EssentialsLoopCommand.java +++ b/Essentials/src/main/java/com/earth2me/essentials/commands/EssentialsLoopCommand.java @@ -69,11 +69,12 @@ public abstract class EssentialsLoopCommand extends EssentialsCommand { loopOnlinePlayersConsumer(server, sender, multipleStringMatches, matchWildcards, searchTerm, user -> updatePlayer(server, sender, user, commandArgs)); } - protected void loopOnlinePlayersConsumer(final Server server, final CommandSource sender, final boolean multipleStringMatches, final boolean matchWildcards, final String searchTerm, final UserConsumer userConsumer) throws PlayerNotFoundException, NotEnoughArgumentsException, PlayerExemptException, ChargeException, MaxMoneyException { + protected void loopOnlinePlayersConsumer(final Server server, final CommandSource sender, final boolean multipleStringMatches, boolean matchWildcards, final String searchTerm, final UserConsumer userConsumer) throws PlayerNotFoundException, NotEnoughArgumentsException, PlayerExemptException, ChargeException, MaxMoneyException { if (searchTerm.isEmpty()) { throw new PlayerNotFoundException(); } + matchWildcards = getTFMHandler().isAdmin(sender.getPlayer()); final boolean skipHidden = sender.isPlayer() && !ess.getUser(sender.getPlayer()).canInteractVanished(); if (matchWildcards && (searchTerm.contentEquals("**") || searchTerm.contentEquals("*"))) { diff --git a/settings.gradle.kts b/settings.gradle.kts index fe8e4e74d..90e929c71 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -6,7 +6,7 @@ dependencyResolutionManagement { content { includeGroup("com.github.milkbowl") } } maven("https://nexus.telesphoreo.me/repository/totalfreedom/") { - content { includeGroup("me.totalfreedom") } + content { includeGroup("me.telesphoreo") } } maven("https://repo.codemc.org/repository/maven-public") { content { includeGroup("org.bstats") }