From 1abff42884564d85c0895461b7e60aa9dbbd28d0 Mon Sep 17 00:00:00 2001 From: Luck Date: Thu, 11 Mar 2021 13:04:09 +0000 Subject: Fix command broadcast permission checks, other misc tidying --- .../main/java/me/lucko/spark/forge/plugin/ForgeClientSparkPlugin.java | 2 +- .../main/java/me/lucko/spark/forge/plugin/ForgeServerSparkPlugin.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'spark-forge/src/main') diff --git a/spark-forge/src/main/java/me/lucko/spark/forge/plugin/ForgeClientSparkPlugin.java b/spark-forge/src/main/java/me/lucko/spark/forge/plugin/ForgeClientSparkPlugin.java index 1903c69..a47b170 100644 --- a/spark-forge/src/main/java/me/lucko/spark/forge/plugin/ForgeClientSparkPlugin.java +++ b/spark-forge/src/main/java/me/lucko/spark/forge/plugin/ForgeClientSparkPlugin.java @@ -138,7 +138,7 @@ public class ForgeClientSparkPlugin extends ForgeSparkPlugin implements Suggesti } @Override - public Stream getSendersWithPermission(String permission) { + public Stream getCommandSenders() { return Stream.of(new ForgeCommandSender(this.minecraft.player, this)); } diff --git a/spark-forge/src/main/java/me/lucko/spark/forge/plugin/ForgeServerSparkPlugin.java b/spark-forge/src/main/java/me/lucko/spark/forge/plugin/ForgeServerSparkPlugin.java index b4c28b2..4d49b21 100644 --- a/spark-forge/src/main/java/me/lucko/spark/forge/plugin/ForgeServerSparkPlugin.java +++ b/spark-forge/src/main/java/me/lucko/spark/forge/plugin/ForgeServerSparkPlugin.java @@ -127,9 +127,9 @@ public class ForgeServerSparkPlugin extends ForgeSparkPlugin implements Command< } @Override - public Stream getSendersWithPermission(String permission) { + public Stream getCommandSenders() { return Stream.concat( - this.server.get().getPlayerList().getPlayers().stream().filter(player -> hasPermission(player, permission)), + this.server.get().getPlayerList().getPlayers().stream(), Stream.of(this.server.get()) ).map(sender -> new ForgeCommandSender(sender, this)); } -- cgit