From c336de27eac34ef935a9322be121ded7818f8b77 Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Sun, 4 Dec 2016 20:07:58 +0100 Subject: [PATCH] Applied changes --- .../listeners/MCChatListener.java | 8 ++--- .../mccommands/DiscordMCCommand.java | 34 ------------------- 2 files changed, 3 insertions(+), 39 deletions(-) delete mode 100644 src/main/java/buttondevteam/discordplugin/mccommands/DiscordMCCommand.java diff --git a/src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java b/src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java index befaa4c..f5a93fb 100644 --- a/src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java +++ b/src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java @@ -4,8 +4,6 @@ import java.util.Arrays; import java.util.HashMap; import java.util.Optional; import java.util.stream.Collectors; -import java.util.stream.Stream; - import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -51,15 +49,15 @@ public class MCChatListener implements Listener, IListener return; if (event.getMessage().getContent().startsWith("/")) { final String cmd = event.getMessage().getContent().substring(1); - Optional str = Bukkit.getOnlinePlayers().stream().filter(p -> { // TODO: Support offline players + Optional player = Bukkit.getOnlinePlayers().stream().filter(p -> { // TODO: Support offline players DiscordPlayer dp = TBMCPlayer.getPlayerAs(p, DiscordPlayer.class); // Online player, already loaded return author.getID().equals(dp.getDiscordID()); }).findAny(); try { - if (str.isPresent()) // Connected? + if (player.isPresent()) // Connected? { if (!ConnectedSenders.containsKey(author.getID())) - ConnectedSenders.put(author.getID(), new DiscordPlayerSender(author, str.get())); + ConnectedSenders.put(author.getID(), new DiscordPlayerSender(author, player.get())); final DiscordPlayerSender dsender = ConnectedSenders.get(author.getID()); dsender.setChannel(event.getMessage().getChannel()); // Execute as ingame player diff --git a/src/main/java/buttondevteam/discordplugin/mccommands/DiscordMCCommand.java b/src/main/java/buttondevteam/discordplugin/mccommands/DiscordMCCommand.java deleted file mode 100644 index d0d2f70..0000000 --- a/src/main/java/buttondevteam/discordplugin/mccommands/DiscordMCCommand.java +++ /dev/null @@ -1,34 +0,0 @@ -package buttondevteam.discordplugin.mccommands; - -import org.bukkit.command.CommandSender; -import buttondevteam.lib.chat.TBMCChatAPI; -import buttondevteam.lib.chat.TBMCCommandBase; - -public class DiscordMCCommand extends TBMCCommandBase { - - @Override - public String GetCommandPath() { - return "discord"; - } - - @Override - public String[] GetHelpText(String alias) { - return TBMCChatAPI.GetSubCommands(this); - } - - @Override - public boolean GetModOnly() { - return false; - } - - @Override - public boolean GetPlayerOnly() { - return true; - } - - @Override - public boolean OnCommand(CommandSender sender, String alias, String[] args) { - return false; - } - -}