ChromaGaming/Chroma-Discord
1
0
Fork 0
Code Issues 21 Pull requests Projects Releases 8 Packages Wiki Activity

Fixed stream double access

Browse source
This commit is contained in:
Norbi Peti 2016-12-02 23:37:28 +01:00
parent f484aba361
commit a2dd94f501
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java
View file

@ -2,6 +2,7 @@ package buttondevteam.discordplugin.listeners;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
import java.util.Optional;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
@ -50,19 +51,19 @@ public class MCChatListener implements Listener, IListener<MessageReceivedEvent>
dsender.setChannel(event.getMessage().getChannel()); dsender.setChannel(event.getMessage().getChannel());
if (event.getMessage().getContent().startsWith("/")) { if (event.getMessage().getContent().startsWith("/")) {
final String cmd = event.getMessage().getContent().substring(1); final String cmd = event.getMessage().getContent().substring(1);
Stream<? extends Player> str = Bukkit.getOnlinePlayers().stream().filter(p -> { // TODO: Support offline players Optional<? extends Player> str = Bukkit.getOnlinePlayers().stream().filter(p -> { // TODO: Support offline players
try (DiscordPlayer dp = TBMCPlayer.getPlayerAs(p, DiscordPlayer.class)) { try (DiscordPlayer dp = TBMCPlayer.getPlayerAs(p, DiscordPlayer.class)) {
return author.getID().equals(dp.getDiscordID()); return author.getID().equals(dp.getDiscordID());
} catch (Exception e) { } catch (Exception e) {
TBMCCoreAPI.SendException("An error occured while getting Discord player for chat", e); TBMCCoreAPI.SendException("An error occured while getting Discord player for chat", e);
return false; return false;
} }
}); }).findAny();
try { try {
if (str.count() > 0) // Connected? if (str.isPresent()) // Connected?
{ {
// Execute as ingame player // Execute as ingame player
Bukkit.dispatchCommand(str.findAny().get(), cmd); Bukkit.dispatchCommand(str.get(), cmd);
} else { } else {
if (!Arrays.stream(UnconnectedCmds).anyMatch(s -> cmd.startsWith(s))) { if (!Arrays.stream(UnconnectedCmds).anyMatch(s -> cmd.startsWith(s))) {
// Command not whitelisted // Command not whitelisted